Title: [99456] trunk
- Revision
- 99456
- Author
- ves...@webkit.org
- Date
- 2011-11-07 12:26:49 -0800 (Mon, 07 Nov 2011)
Log Message
[Qt] Build all libraries in both debug and release on Mac OS X
We were already building the final shared library in debug and release,
but were missing the static _javascript_Core and WebCore libraries, which
then broke the build.
Reviewed-by Andreas Kling.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/Target.pri (99455 => 99456)
--- trunk/Source/WebKit2/Target.pri 2011-11-07 20:21:36 UTC (rev 99455)
+++ trunk/Source/WebKit2/Target.pri 2011-11-07 20:26:49 UTC (rev 99456)
@@ -17,9 +17,6 @@
QT += declarative
-# Build both debug and release configurations
-mac: CONFIG += build_all
-
WEBKIT1_HEADERS_SHARED_WITH_WEBKIT2= \
$$PWD/../WebKit/qt/WebCoreSupport/QtWebComboBox.h
Modified: trunk/Source/api.pri (99455 => 99456)
--- trunk/Source/api.pri 2011-11-07 20:21:36 UTC (rev 99455)
+++ trunk/Source/api.pri 2011-11-07 20:26:49 UTC (rev 99456)
@@ -209,20 +209,18 @@
!build_pass {
message("Building QtWebKit as a framework, as that's how Qt was built. You can")
message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
-
- CONFIG += build_all
} else {
isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
}
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
FRAMEWORK_HEADERS.version = Versions
- FRAMEWORK_HEADERS.files = $$dirname(headers.files)/$${TARGET}
+ FRAMEWORK_HEADERS.files = $$dirname(headers.files)/QtWebKit
FRAMEWORK_HEADERS.path = Headers
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
# No-op to satisfy the dependency for FRAMEWORK_HEADERS
- module_include.target = $$dirname(headers.files)/$${TARGET}
+ module_include.target = $$dirname(headers.files)/QtWebKit
module_include.commands = $${MAKEFILE_NOOP_COMMAND}
contains(QMAKE_EXTRA_TARGETS, fwheader_generator): module_include.depends += fwheader_generator
QMAKE_EXTRA_TARGETS += module_include
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (99455 => 99456)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-07 20:21:36 UTC (rev 99455)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-07 20:26:49 UTC (rev 99456)
@@ -7,6 +7,8 @@
TEMPLATE = lib
TARGET = WTRInjectedBundle
+mac:debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
+
SOURCES += \
InjectedBundle.cpp \
InjectedBundle.h \
@@ -42,12 +44,6 @@
QT += declarative widgets
-!CONFIG(release, debug|release) {
- OBJECTS_DIR = obj/debug
-} else { # Release
- OBJECTS_DIR = obj/release
-}
-
load(features)
load(webcore)
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (99455 => 99456)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-07 20:21:36 UTC (rev 99455)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-07 20:26:49 UTC (rev 99456)
@@ -120,6 +120,9 @@
# 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
+
DEFINES += QT_ASCII_CAST_WARNINGS
win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/_javascript_Core/os-win32
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
