Title: [156535] trunk
- Revision
- 156535
- Author
- [email protected]
- Date
- 2013-09-27 05:16:23 -0700 (Fri, 27 Sep 2013)
Log Message
[Qt] Fix force_static_libs_as_shared in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=121961
Reviewed by Csaba Osztrogonác.
Source/WebKit/qt:
* WebCoreSupport/QWebFrameAdapter.h:
Source/WebKit2:
Do not add strict ordering for webkit2qml. It is not needed and causes
Target.pri to be built out of order.
* WebKit2.pro:
Tools:
Reenable force_static_libs_as_shared when building WebKit2.
* qmake/mkspecs/features/default_post.prf:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (156534 => 156535)
--- trunk/Source/WebKit/qt/ChangeLog 2013-09-27 11:57:52 UTC (rev 156534)
+++ trunk/Source/WebKit/qt/ChangeLog 2013-09-27 12:16:23 UTC (rev 156535)
@@ -1,3 +1,12 @@
+2013-09-27 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Fix force_static_libs_as_shared in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=121961
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCoreSupport/QWebFrameAdapter.h:
+
2013-09-25 Brent Fulgham <[email protected]>
Refactor RuntimeEnabledFeatures as a Singleton.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h (156534 => 156535)
--- trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h 2013-09-27 11:57:52 UTC (rev 156534)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h 2013-09-27 12:16:23 UTC (rev 156535)
@@ -22,6 +22,7 @@
#include "FrameLoaderClientQt.h"
#include "PlatformEvent.h"
+#include "PlatformExportMacros.h"
#if ENABLE(ORIENTATION_EVENTS) && HAVE(QTSENSORS)
#include "qorientationsensor.h"
#endif // ENABLE(ORIENTATION_EVENTS).
Modified: trunk/Source/WebKit2/ChangeLog (156534 => 156535)
--- trunk/Source/WebKit2/ChangeLog 2013-09-27 11:57:52 UTC (rev 156534)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-27 12:16:23 UTC (rev 156535)
@@ -1,3 +1,15 @@
+2013-09-27 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Fix force_static_libs_as_shared in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=121961
+
+ Reviewed by Csaba Osztrogonác.
+
+ Do not add strict ordering for webkit2qml. It is not needed and causes
+ Target.pri to be built out of order.
+
+ * WebKit2.pro:
+
2013-09-26 Anders Carlsson <[email protected]>
Remove Windows code
Modified: trunk/Source/WebKit2/WebKit2.pro (156534 => 156535)
--- trunk/Source/WebKit2/WebKit2.pro 2013-09-27 11:57:52 UTC (rev 156534)
+++ trunk/Source/WebKit2/WebKit2.pro 2013-09-27 12:16:23 UTC (rev 156535)
@@ -16,6 +16,4 @@
have?(QTQUICK) {
webkit2qml.file = WebKit2QML.pri
SUBDIRS += webkit2qml
-
- addStrictSubdirOrderBetween(target, webkit2qml)
}
Modified: trunk/Tools/ChangeLog (156534 => 156535)
--- trunk/Tools/ChangeLog 2013-09-27 11:57:52 UTC (rev 156534)
+++ trunk/Tools/ChangeLog 2013-09-27 12:16:23 UTC (rev 156535)
@@ -1,5 +1,16 @@
2013-09-27 Allan Sandfeld Jensen <[email protected]>
+ [Qt] Fix force_static_libs_as_shared in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=121961
+
+ Reviewed by Csaba Osztrogonác.
+
+ Reenable force_static_libs_as_shared when building WebKit2.
+
+ * qmake/mkspecs/features/default_post.prf:
+
+2013-09-27 Allan Sandfeld Jensen <[email protected]>
+
[Qt] Mock implementations of positioning and orientation not used
https://bugs.webkit.org/show_bug.cgi?id=121956
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (156534 => 156535)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2013-09-27 11:57:52 UTC (rev 156534)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2013-09-27 12:16:23 UTC (rev 156535)
@@ -13,7 +13,7 @@
# Enable dynamic instead of static libraries for development
# Avoid it with debug_and_release, it can cause the application to load both the debug and release
# dependent libraries when using frameworks on Mac.
-!production_build:!debug_and_release:!buildbot:!win*:!build?(webkit2): CONFIG += force_static_libs_as_shared
+!production_build:!debug_and_release:!buildbot:!win*: CONFIG += force_static_libs_as_shared
# Don't create .prl files for intermediate libraries because their contents get used when linking against
# them, breaking "-Wl,-whole-archive -lMyIntermediateLib --Wl,-no-whole-archive"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
