Diff
Modified: trunk/ChangeLog (104025 => 104026)
--- trunk/ChangeLog 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/ChangeLog 2012-01-04 12:55:18 UTC (rev 104026)
@@ -1,3 +1,11 @@
+2012-01-04 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move use of $$qtLibraryTarget() to a single place
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * Source/api.pri:
+
2012-01-04 Mary Wu <[email protected]>
Enable DOWNLOAD_ATTRIBUTE in BlackBerry porting
Modified: trunk/Source/WebKit/qt/ChangeLog (104025 => 104026)
--- trunk/Source/WebKit/qt/ChangeLog 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-01-04 12:55:18 UTC (rev 104026)
@@ -1,3 +1,13 @@
+2012-01-04 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move use of $$qtLibraryTarget() to a single place
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * declarative/experimental/experimental.pri:
+ * declarative/public.pri:
+ * examples/platformplugin/platformplugin.pro:
+
2012-01-03 Jon Lee <[email protected]>
Leak of WebNotificationClient when page is destroyed
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (104025 => 104026)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-01-04 12:55:18 UTC (rev 104026)
@@ -20,7 +20,6 @@
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
-TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
wince*:LIBS += $$QMAKE_LIBS_GUI
Modified: trunk/Source/WebKit/qt/declarative/public.pri (104025 => 104026)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-01-04 12:55:18 UTC (rev 104026)
@@ -20,7 +20,6 @@
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
-TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
wince*:LIBS += $$QMAKE_LIBS_GUI
Modified: trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro (104025 => 104026)
--- trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2012-01-04 12:55:18 UTC (rev 104026)
@@ -1,6 +1,7 @@
-QT += core gui
-TARGET = $$qtLibraryTarget(platformplugin)
TEMPLATE = lib
+TARGET = platformplugin
+
+QT += core gui
CONFIG += plugin
## load mobilityconfig if mobility is available
Modified: trunk/Source/api.pri (104025 => 104026)
--- trunk/Source/api.pri 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Source/api.pri 2012-01-04 12:55:18 UTC (rev 104026)
@@ -203,14 +203,8 @@
}
mac {
- !static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
- !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.")
- } else {
- isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
- }
-
+ !static:contains(QT_CONFIG, qt_framework) {
+ # Build QtWebKit as a framework, to match how Qt was built
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
# For debug_and_release configs, only copy headers in release
Modified: trunk/Tools/ChangeLog (104025 => 104026)
--- trunk/Tools/ChangeLog 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Tools/ChangeLog 2012-01-04 12:55:18 UTC (rev 104026)
@@ -1,3 +1,14 @@
+2012-01-04 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Move use of $$qtLibraryTarget() to a single place
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/webcore.prf:
+
2012-01-04 Mary Wu <[email protected]>
Enable DOWNLOAD_ATTRIBUTE in BlackBerry porting
Modified: trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro (104025 => 104026)
--- trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2012-01-04 12:55:18 UTC (rev 104026)
@@ -49,7 +49,6 @@
QMAKE_BUNDLE_LOCATION += "Contents/MacOS"
!build_pass:CONFIG += build_all
- debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
OBJECTIVE_SOURCES += PluginObjectMac.mm
LIBS += -framework Carbon -framework Cocoa -framework QuartzCore
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (104025 => 104026)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-01-04 12:55:18 UTC (rev 104026)
@@ -7,8 +7,6 @@
TEMPLATE = lib
TARGET = WTRInjectedBundle
-mac:debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
-
SOURCES += \
AccessibilityController.cpp \
AccessibilityTextMarker.cpp \
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (104025 => 104026)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-01-04 12:55:18 UTC (rev 104026)
@@ -130,6 +130,8 @@
# Build both debug and release configurations
mac: CONFIG += build_all
+ TARGET = $$qtLibraryTarget($$TARGET)
+
DEFINES += QT_ASCII_CAST_WARNINGS
win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/_javascript_Core/os-win32
Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (104025 => 104026)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2012-01-04 11:31:11 UTC (rev 104025)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2012-01-04 12:55:18 UTC (rev 104026)
@@ -215,7 +215,6 @@
win32-*|wince* {
DLLDESTDIR = $${ROOT_BUILD_DIR}/bin
- isEmpty(QT_SOURCE_TREE):build_pass: TARGET = $$qtLibraryTarget($$TARGET)
dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
dlltarget.CONFIG = no_path
