diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-23 21:21:01 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-24 11:18:06 +0000 |
| commit | f5e23333e851def3a556cb979ca77e6c7a9fb0bf (patch) | |
| tree | 355cf48f031f21c3a722f25ef2a4e0096d72b0c4 /Source/JavaScriptCore | |
| parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
| download | qtwebkit-f5e23333e851def3a556cb979ca77e6c7a9fb0bf.tar.gz | |
Adapt to qtbase configure changes to fix build
Change-Id: I5f84aeb483d01670525aadd53bf10a65c4da9b82
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/LLIntOffsetsExtractor.pro | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/jsc.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro index e522053d7..1d13d30e9 100644 --- a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro +++ b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro @@ -62,7 +62,7 @@ macx { DESTDIR = $$targetSubDir() llint.output = $$targetSubDir()/$$llint.output INCLUDEPATH += $$targetSubDir() - contains(QT_CONFIG, qt_framework) { + qtConfig(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 diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro index 4efe024d6..77dc4414b 100644 --- a/Source/JavaScriptCore/jsc.pro +++ b/Source/JavaScriptCore/jsc.pro @@ -28,6 +28,6 @@ wince* { } # Prevent warnings about difference in visibility on Mac OS X -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions +qtConfig(reduce_exports):CONFIG += hide_symbols +unix:qtConfig(reduce_relocations):CONFIG += bsymbolic_functions |