Commit 67066198 authored by hausmann@webkit.org's avatar hausmann@webkit.org
Browse files

[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ø <tor.arne.vestbo@nokia.com> on 2012-09-14
Reviewed by Simon Hausmann.

* Source/api.pri:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128614 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7cff57c4
2012-09-14 Simon Hausmann <simon.hausmann@nokia.com>
[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 <christophe.dumez@intel.com>
 
WebKitTestRunner needs layoutTestController.setStopProvisionalFrameLoads
......
......@@ -38,6 +38,7 @@ DEFINES += USE_SYSTEM_MALLOC=1
have?(FONTCONFIG): PKGCONFIG += fontconfig
INCLUDEPATH += \
$$PWD \
$${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt
PREFIX_HEADER = WebKitTestRunnerPrefix.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment