From c7e0a67c1b04e6341c89d6e81adc407aa554073a Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Mon, 20 Apr 2015 17:56:16 +0300
Subject: [PATCH] [qmake] Use depend_includepath for correct compilation.

---
 common.pri | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common.pri b/common.pri
index 66283e092c..4962069a29 100644
--- a/common.pri
+++ b/common.pri
@@ -16,17 +16,17 @@ VERSION_MINOR = 4
 # qt's variable
 VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}
 
-# Additional include directories, common to most projects.
-# /../omim part is used to avoid qmake issue when whole project
-# recompiles without any modification.
-INCLUDEPATH *= $$ROOT_DIR/../omim
-DEPENDPATH  *= $$ROOT_DIR/../omim
+# ROOT_DIR is in INCLUDEPATH now according to the new include policy.
+INCLUDEPATH *= $$ROOT_DIR
+# Do not set DEPENDPATH - it causes rebuild all with minor changes.
+#DEPENDPATH  *= $$ROOT_DIR
 INCLUDEPATH *= $$ROOT_DIR/3party/boost
 INCLUDEPATH *= $$ROOT_DIR/3party/glm
 
 # Hack for Qt5 qmake to make it much faster.
 # Turns off any external headers modification check (see DEPENDPATH).
-CONFIG -= depend_includepath
+# Do not remove depend_includepath in CONFIG. Need to check modifications within ROOT_DIR.
+#CONFIG -= depend_includepath
 
 CONFIG *= c++11