summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-10-01 18:37:51 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-11 16:07:58 +0200
commita7da7f8ab00e6fe246ff8a02082305ea7f833fd3 (patch)
tree73d4929af888c2cd9ecf275fb8e6e32cca86dd6e
parent4a324d488d23ae9fed0e9fd415dc88613121c780 (diff)
Mac: INCLUDEPATH fix
Something seems to be busted with 5.2 lately. Specifically on Mac. Work around the problem for now. Change-Id: I4180257f31e67d02d46e26808e8b044f3b0c0cd2 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r--lib/lib.pro3
-rw-r--r--shared/shared.pro3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/lib.pro b/lib/lib.pro
index e9689fa39..dbfde8c59 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -23,6 +23,9 @@ RESOURCES += lib_resources.qrc
# We need this to find the include files generated for the .pak resource files.
INCLUDEPATH += $$absolute_path(../resources, $$PWD)
+# something fishy with qmake in 5.2 ?
+INCLUDEPATH += $$[QT_INSTALL_HEADERS]
+
SOURCES = \
backing_store_qt.cpp \
content_browser_client_qt.cpp \
diff --git a/shared/shared.pro b/shared/shared.pro
index 108a9a255..a125819e0 100644
--- a/shared/shared.pro
+++ b/shared/shared.pro
@@ -13,6 +13,9 @@ TARGET = qtwebengine_shared
DEFINES += QT_NO_KEYWORDS \
Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS
+# something fishy with qmake in 5.2 ?
+INCLUDEPATH += $$[QT_INSTALL_HEADERS]
+
# We need a way to tap into gyp´s Debug vs. Release configuration
PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBENGINEPROCESS_NAME\\\"