Title: [128614] trunk/Tools
- Revision
- 128614
- Author
- [email protected]
- Date
- 2012-09-14 08:47:15 -0700 (Fri, 14 Sep 2012)
Log Message
[Qt] Fix handling of debug/release/debug_and_release/build_all
We now pick up the defaults from Qt, in default_pre (CONFIG already
contains the appropriate values for debug and release). We then let
the command line arguments to qmake, or the project files themselves,
override the configuration, and finally we sanitize the configuration
in default_post.
Patch by Tor Arne Vestbø <[email protected]> on 2012-09-14
Reviewed by Simon Hausmann.
* Source/api.pri:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128613 => 128614)
--- trunk/Tools/ChangeLog 2012-09-14 15:38:41 UTC (rev 128613)
+++ trunk/Tools/ChangeLog 2012-09-14 15:47:15 UTC (rev 128614)
@@ -1,3 +1,17 @@
+2012-09-14 Simon Hausmann <[email protected]>
+
+ [Qt] Fix build of WTR on Windows
+
+ Reviewed by Tor Arne Vestbø.
+
+ WTR/qt/main.cpp includes TestController.h, which lives in just WTR/
+ With qmake's unix makefile generator as well as with the MingW generator,
+ the directory where the pro file lives (WTR/) is automatically added to
+ the include search path, but not so with MSVC. Instead of relying on qmake's
+ implicit feature here, add WTR/ explicitly to the include search path.
+
+ * WebKitTestRunner/Target.pri:
+
2012-09-14 Christophe Dumez <[email protected]>
WebKitTestRunner needs layoutTestController.setStopProvisionalFrameLoads
Modified: trunk/Tools/WebKitTestRunner/Target.pri (128613 => 128614)
--- trunk/Tools/WebKitTestRunner/Target.pri 2012-09-14 15:38:41 UTC (rev 128613)
+++ trunk/Tools/WebKitTestRunner/Target.pri 2012-09-14 15:47:15 UTC (rev 128614)
@@ -38,6 +38,7 @@
have?(FONTCONFIG): PKGCONFIG += fontconfig
INCLUDEPATH += \
+ $$PWD \
$${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt
PREFIX_HEADER = WebKitTestRunnerPrefix.h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
