Commit bb5e6bef authored by vestbo@webkit.org's avatar vestbo@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.

Reviewed by Simon Hausmann.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128606 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 98aed1f2
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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.
Reviewed by Simon Hausmann.
* Source/api.pri:
2012-09-14 Keishi Hattori <keishi@webkit.org>
Add runtime flag that enables lang attribute for form controls in LayoutTests
......
......@@ -51,14 +51,6 @@ BASE_TARGET = $$TARGET
load(qt_module)
# Make sure the module config doesn't override our preferred build config.
debug_and_release:if(!debug|!release) {
# Removing debug_and_release causes issues with lib suffixes when building debug on Windows.
# Work around it by only removing build_all, and still create the Makefiles for both configurations.
win32*: CONFIG -= build_all
else: CONFIG -= debug_and_release
}
# Allow doing a debug-only build of WebKit (not supported by Qt)
macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
......
2012-09-14 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
[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.
Reviewed by Simon Hausmann.
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/default_pre.prf:
* qmake/mkspecs/features/mac/default_pre.prf:
2012-09-14 Sudarsana Nagineni <sudarsana.nagineni@linux.intel.com>
 
WebKitTestRunner needs layoutTestController.setTabKeyCyclesThroughElements
......
......@@ -50,8 +50,6 @@ mac {
QMAKE_PLUGIN_BUNDLE_NAME = $$TARGET
QMAKE_BUNDLE_LOCATION += "Contents/MacOS"
!build_pass:CONFIG += build_all
OBJECTIVE_SOURCES += PluginObjectMac.mm
LIBS += -framework Carbon -framework Cocoa -framework QuartzCore
}
......
......@@ -2267,7 +2267,6 @@ sub buildQMakeProjects
} elsif ($passedConfig) {
die "Build type $passedConfig is not supported with --qt.\n";
}
push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
# Using build-webkit to build assumes you want a developer-build
push @buildArgs, "CONFIG-=production_build";
......
......@@ -12,6 +12,19 @@ CONFIG += config_step
root_project_file: finalizeConfigure()
# Sanitize build config for single-configuration builds
!debug|!release {
# Removing debug_and_release causes issues with lib suffixes when building debug on Windows.
# Work around it by only removing build_all, and still create the Makefiles for both configurations.
win32*: CONFIG -= build_all
else: CONFIG -= debug_and_release
} else:debug_and_release {
# Only build a single instance of each application
contains(TEMPLATE, app) {
CONFIG -= build_all
}
}
# Help keep the build tree clean
MOC_DIR = moc
RCC_DIR = rcc
......@@ -153,9 +166,6 @@ contains(TEMPLATE, lib) {
# Triggers the right export macro for the QtWebKit API (see qwebkitglobal.h)
DEFINES += BUILDING_WEBKIT
# Build both debug and release configurations
mac: CONFIG += build_all
# Prevent name clashes when building both debug and release. Qt5's module
# system already takes care of this for the top level QtWebKit library.
!qt_install_module:debug_and_release: TARGET = $$qtLibraryTarget($$TARGET)
......
......@@ -102,6 +102,12 @@ CONFIG += include_webinspector
# used by bots and developers, will disable it, to enable warnings etc.
CONFIG += production_build
# Pick up Qt's defaults for debug/release/debug_and_release
if(win32|mac):!macx-xcode {
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
contains(QT_CONFIG, build_all): CONFIG += build_all
}
# Try to locate sqlite3 source (for WebCore)
SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
isEmpty(SQLITE3SRCDIR) {
......
......@@ -5,7 +5,6 @@
# -------------------------------------------------------------------
CONFIG -= app_bundle
CONFIG += debug_and_release
load(default_pre)
......
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