summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-07-21 14:04:51 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-07-24 02:21:43 +0000
commit2495ea388fce8187fa28afa98d269e327a79b537 (patch)
tree07dc555dacee648802e69e368547d9058bf4ff47 /Source/JavaScriptCore
parentb0aba679de5a699ec35c569971fae9d6afa684d3 (diff)
downloadqtwebkit-2495ea388fce8187fa28afa98d269e327a79b537.tar.gz
Fix build against installed QtBase
We need two little hacks to make it possible to build against a frameworks build of QtBase that is installed. Change-Id: I82e530a3c52ad90ad37044a367a8f8eb6ddfd887 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'Source/JavaScriptCore')
-rw-r--r--Source/JavaScriptCore/LLIntOffsetsExtractor.pro6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro
index 5a66d1ff3..cba9b9ffb 100644
--- a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro
+++ b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro
@@ -61,6 +61,12 @@ macx {
DESTDIR = $$targetSubDir()
llint.output = $$targetSubDir()/$$llint.output
INCLUDEPATH += $$targetSubDir()
+ contains(QT_CONFIG, qt_framework) {
+ # Add framework headers directly to make #include <qglobal.h> work
+ INCLUDEPATH += $$QT.core.libs/QtCore.framework/Headers
+ # Extend framework search path to make #include <QtCore/qconfig.h> work
+ QMAKE_CXXFLAGS += -F$$QT.core.libs
+ }
}
# Compilation of this file will automatically depend on LLIntDesiredOffsets.h