Title: [146593] trunk/Tools
- Revision
- 146593
- Author
- [email protected]
- Date
- 2013-03-22 05:24:48 -0700 (Fri, 22 Mar 2013)
Log Message
[Qt] Fix the TestWebKitAPI build
https://bugs.webkit.org/show_bug.cgi?id=113044
Reviewed by Tor Arne Vestbø.
The generate-forwarding-headers script would only be run
after the targets in InjectedBundle.pri since the second
addStrictSubdirOrderBetween call in
Tools/TestWebKitAPI/TestWebKitAPI.pro would overwrite
the derived_sources -> injected_bundle order in SUBDIRS.
Fix it by only moving the dependent target at the end of
SUBDIRS, don't touch its dependency.
* qmake/mkspecs/features/functions.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (146592 => 146593)
--- trunk/Tools/ChangeLog 2013-03-22 12:14:09 UTC (rev 146592)
+++ trunk/Tools/ChangeLog 2013-03-22 12:24:48 UTC (rev 146593)
@@ -1,3 +1,21 @@
+2013-03-22 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Fix the TestWebKitAPI build
+ https://bugs.webkit.org/show_bug.cgi?id=113044
+
+ Reviewed by Tor Arne Vestbø.
+
+ The generate-forwarding-headers script would only be run
+ after the targets in InjectedBundle.pri since the second
+ addStrictSubdirOrderBetween call in
+ Tools/TestWebKitAPI/TestWebKitAPI.pro would overwrite
+ the derived_sources -> injected_bundle order in SUBDIRS.
+
+ Fix it by only moving the dependent target at the end of
+ SUBDIRS, don't touch its dependency.
+
+ * qmake/mkspecs/features/functions.prf:
+
2013-03-22 Sudarsana Nagineni <[email protected]>
[EFL][WK2] View is not focused when fullscreen mode toggled
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (146592 => 146593)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2013-03-22 12:14:09 UTC (rev 146592)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2013-03-22 12:24:48 UTC (rev 146593)
@@ -133,8 +133,8 @@
}
# Make sure the order is right
- SUBDIRS -= $$firstSubdir $$secondSubdir
- SUBDIRS += $$firstSubdir $$secondSubdir
+ SUBDIRS -= $$secondSubdir
+ SUBDIRS += $$secondSubdir
NO_RECURSIVE_QMAKE_SUBDIRS += $$firstSubdir $$secondSubdir
CONFIG *= ordered
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
