Title: [141892] trunk
- Revision
- 141892
- Author
- [email protected]
- Date
- 2013-02-05 07:34:51 -0800 (Tue, 05 Feb 2013)
Log Message
[Qt] REGRESSION(r137436): It made all inspector tests timeout on developer builds
https://bugs.webkit.org/show_bug.cgi?id=106554
Reviewed by Simon Hausmann.
.:
Explicitely link WebCore resources in the final DLL only on Windows to
support force_static_libs_as_shared on other platforms.
WebKit1 applications don't get the QtWebKit dynamic library loaded
since libQtWebKitWidgets doesn't depend on libQtWebKit if WebCore and
WebKit1 are dynamic libraries of their own.
* Source/api.pri:
Source/WebCore:
* Target.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (141891 => 141892)
--- trunk/ChangeLog 2013-02-05 15:05:48 UTC (rev 141891)
+++ trunk/ChangeLog 2013-02-05 15:34:51 UTC (rev 141892)
@@ -1,3 +1,19 @@
+2013-02-05 Jocelyn Turcotte <[email protected]>
+
+ [Qt] REGRESSION(r137436): It made all inspector tests timeout on developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=106554
+
+ Reviewed by Simon Hausmann.
+
+ Explicitely link WebCore resources in the final DLL only on Windows to
+ support force_static_libs_as_shared on other platforms.
+
+ WebKit1 applications don't get the QtWebKit dynamic library loaded
+ since libQtWebKitWidgets doesn't depend on libQtWebKit if WebCore and
+ WebKit1 are dynamic libraries of their own.
+
+ * Source/api.pri:
+
2013-02-05 Martin Robinson <[email protected]>
Update the NEWS and configuration in preparation for 1.11.5.
Modified: trunk/Source/WebCore/ChangeLog (141891 => 141892)
--- trunk/Source/WebCore/ChangeLog 2013-02-05 15:05:48 UTC (rev 141891)
+++ trunk/Source/WebCore/ChangeLog 2013-02-05 15:34:51 UTC (rev 141892)
@@ -1,3 +1,12 @@
+2013-02-05 Jocelyn Turcotte <[email protected]>
+
+ [Qt] REGRESSION(r137436): It made all inspector tests timeout on developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=106554
+
+ Reviewed by Simon Hausmann.
+
+ * Target.pri:
+
2013-02-05 Peter Rybin <[email protected]>
Web Inspector: prevent crash, add required error string value
Modified: trunk/Source/WebCore/Target.pri (141891 => 141892)
--- trunk/Source/WebCore/Target.pri 2013-02-05 15:05:48 UTC (rev 141891)
+++ trunk/Source/WebCore/Target.pri 2013-02-05 15:34:51 UTC (rev 141892)
@@ -14,6 +14,18 @@
CONFIG += staticlib
+# Do it in the WebCore static lib to support force_static_libs_as_shared
+# since the QtWebKitWidgets lib wouldn't load QtWebKit in that case.
+# This should match the opposite statement in api.pri for the QtWebKit lib.
+!win* {
+ RESOURCES += $$PWD/WebCore.qrc
+ include_webinspector {
+ RESOURCES += \
+ $$PWD/inspector/front-end/WebKit.qrc \
+ $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendCommands.qrc
+ }
+}
+
SOURCES += \
Modules/geolocation/Geolocation.cpp \
Modules/geolocation/GeolocationController.cpp \
Modified: trunk/Source/api.pri (141891 => 141892)
--- trunk/Source/api.pri 2013-02-05 15:05:48 UTC (rev 141891)
+++ trunk/Source/api.pri 2013-02-05 15:34:51 UTC (rev 141892)
@@ -46,15 +46,17 @@
# on the QT variable can be picked up when we later load(qt_module).
load(webkit_modules)
-# Resources have to be included directly in the final binary.
-# MSVC's linker won't pick them from a static library since they aren't referenced.
-RESOURCES += $$PWD/WebCore/WebCore.qrc
-include_webinspector {
- # WEBCORE_GENERATED_SOURCES_DIR is defined in WebCore.pri, included by
- # load(webkit_modules) if WEBKIT contains webcore.
- RESOURCES += \
- $$PWD/WebCore/inspector/front-end/WebKit.qrc \
- $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendCommands.qrc
+# Resources have to be included directly in the final binary for MSVC.
+# The linker won't pick them from a static library since they aren't referenced.
+win* {
+ RESOURCES += $$PWD/WebCore/WebCore.qrc
+ include_webinspector {
+ # WEBCORE_GENERATED_SOURCES_DIR is defined in WebCore.pri, included by
+ # load(webkit_modules) if WEBKIT contains webcore.
+ RESOURCES += \
+ $$PWD/WebCore/inspector/front-end/WebKit.qrc \
+ $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendCommands.qrc
+ }
}
# ---------------- Custom developer-build handling -------------------
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
