diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-02 12:25:24 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-02 12:25:24 +0100 |
| commit | c4bc74fc79a3b206d80d6c4a595f4c6425573c7f (patch) | |
| tree | 6c9a720d2193b4e3fbbb724dc8869b6d7c163bb8 /Source/JavaScriptCore | |
| parent | 3c7e881843b79f0f94aa90aa24357aeaa4622d0b (diff) | |
| download | qtwebkit-c4bc74fc79a3b206d80d6c4a595f4c6425573c7f.tar.gz | |
[Qt] Fix build on Windows when Qt is configured with -release
https://bugs.webkit.org/show_bug.cgi?id=101041
Reviewed by Jocelyn Turcotte.
When Qt is configured with -debug or -release, the release/debug build of for example
QtCore is not available by default. For LLIntExtractor we always need to build debug
_and_ release versions, but we do not actually need any Qt libraries nor qtmain(d).lib.
Therefore we can disable all these features but need to keep $$QT.core.includes in the
INCLUDEPATH for some defines from qglobal.h.
* LLIntOffsetsExtractor.pro:
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/ChangeLog | 15 | ||||
| -rw-r--r-- | Source/JavaScriptCore/LLIntOffsetsExtractor.pro | 7 |
2 files changed, 21 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index db48e56b7..b2c4299ce 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,18 @@ +2012-11-02 Simon Hausmann <simon.hausmann@digia.com> + + [Qt] Fix build on Windows when Qt is configured with -release + https://bugs.webkit.org/show_bug.cgi?id=101041 + + Reviewed by Jocelyn Turcotte. + + When Qt is configured with -debug or -release, the release/debug build of for example + QtCore is not available by default. For LLIntExtractor we always need to build debug + _and_ release versions, but we do not actually need any Qt libraries nor qtmain(d).lib. + Therefore we can disable all these features but need to keep $$QT.core.includes in the + INCLUDEPATH for some defines from qglobal.h. + + * LLIntOffsetsExtractor.pro: + 2012-10-25 Simon Hausmann <simon.hausmann@digia.com> [Qt] Fix the LLInt build on Windows diff --git a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro index 9cbc4248d..1fc6c1d7c 100644 --- a/Source/JavaScriptCore/LLIntOffsetsExtractor.pro +++ b/Source/JavaScriptCore/LLIntOffsetsExtractor.pro @@ -13,7 +13,12 @@ debug_and_release { CONFIG += build_all } -QT = core # Needed for qglobal.h +# Don't try to link against any Qt libraries, but at least +# pull in include paths as we include qglobal.h. +INCLUDEPATH += $$QT.core.includes +CONFIG += console +CONFIG -= qt +LIBS = defineTest(addIncludePaths) { # Just needed for include paths |