Title: [133302] trunk/Source/_javascript_Core
- Revision
- 133302
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-02 08:42:37 -0700 (Fri, 02 Nov 2012)
Log Message
[Qt] Fix build on Windows when Qt is configured with -release
https://bugs.webkit.org/show_bug.cgi?id=101041
Patch by Simon Hausmann <simon.hausm...@digia.com> on 2012-11-02
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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (133301 => 133302)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-02 15:26:53 UTC (rev 133301)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-02 15:42:37 UTC (rev 133302)
@@ -1,3 +1,18 @@
+2012-11-02 Simon Hausmann <simon.hausm...@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-11-01 Mark Lam <mark....@apple.com>
A llint workaround for a toolchain issue.
Modified: trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro (133301 => 133302)
--- trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro 2012-11-02 15:26:53 UTC (rev 133301)
+++ trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro 2012-11-02 15:42:37 UTC (rev 133302)
@@ -13,7 +13,12 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
