Title: [128429] trunk
- Revision
- 128429
- Author
- [email protected]
- Date
- 2012-09-13 01:50:40 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2
https://bugs.webkit.org/show_bug.cgi?id=96545
Reviewed by Tor Arne Vestbø.
Do the QMAKE_INTERNAL_INCLUDED_FILES trick separately for WebKit1.pro and WebKit2/Target.pri,
depending on build?(webkit1) and build?(webkit2), as discussed earlier.
* Source/api.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (128428 => 128429)
--- trunk/ChangeLog 2012-09-13 08:43:33 UTC (rev 128428)
+++ trunk/ChangeLog 2012-09-13 08:50:40 UTC (rev 128429)
@@ -1,3 +1,15 @@
+2012-09-13 Simon Hausmann <[email protected]>
+
+ [Qt] syncqt isn't re-run when WebKit1.pro changes and we're building with --no-webkit2
+ https://bugs.webkit.org/show_bug.cgi?id=96545
+
+ Reviewed by Tor Arne Vestbø.
+
+ Do the QMAKE_INTERNAL_INCLUDED_FILES trick separately for WebKit1.pro and WebKit2/Target.pri,
+ depending on build?(webkit1) and build?(webkit2), as discussed earlier.
+
+ * Source/api.pri:
+
2012-09-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r127876.
Modified: trunk/Source/api.pri (128428 => 128429)
--- trunk/Source/api.pri 2012-09-13 08:43:33 UTC (rev 128428)
+++ trunk/Source/api.pri 2012-09-13 08:50:40 UTC (rev 128429)
@@ -71,16 +71,13 @@
WEBKIT += wtf _javascript_core webcore
build?(webkit1): WEBKIT += webkit1
+build?(webkit2): WEBKIT += webkit2
-build?(webkit2) {
- WEBKIT += webkit2
+# Ensure that changes to the WebKit1 and WebKit2 API will trigger a qmake of this
+# file, which in turn runs syncqt to update the forwarding headers.
+build?(webkit1): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit/WebKit1.pro
+build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
- # Ensure that changes to the WebKit1 and WebKit2 API will trigger a qmake of this
- # file, which in turn runs syncqt to update the forwarding headers.
- QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
- QMAKE_INTERNAL_INCLUDED_FILES *= WebKit/WebKit1.pro
-}
-
use?(3D_GRAPHICS): WEBKIT += angle
qnx {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
