summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-01-09 13:07:22 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2015-01-09 13:07:19 +0100
commit917e78fb8848b9e31c81d6d4b0286ee23c0a84f1 (patch)
tree37b5bb31653ee4aa3de92c600483934a1798b746
parentee7af79a213ea008e8e8bde4a993a92a66b01384 (diff)
Revert "Mac: INCLUDEPATH fix"
This reverts commit a7da7f8ab00e6fe246ff8a02082305ea7f833fd3. Adding the install prefix to the inlude search paths causes us to pick up header files from there if there are any, which causes all sorts of issues. Conflicts: lib/lib.pro shared/shared.pro Change-Id: I070ff6443bb5612b3b7e3878d22dc9dd69d62e70 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
-rw-r--r--src/core/core_gyp_generator.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 38aba3a7..3817c334 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -29,8 +29,7 @@ else: DEFINES += QT_NO_EGL
RESOURCES += devtools.qrc
-# something fishy with qmake in 5.2 ?
-INCLUDEPATH += $$[QT_INSTALL_HEADERS] $$PWD
+INCLUDEPATH += $$PWD
SOURCES = \
access_token_store_qt.cpp \