Title: [109894] trunk/Tools
- Revision
- 109894
- Author
- ves...@webkit.org
- Date
- 2012-03-06 03:51:17 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Make sure clean builds are followed by make qmake && make if needed
On non-GNUmake systems we have to run make qmake so that the generated
sources are generated before we run qmake on the target pro files. This
is achieved by using the 'incremental' target.
Reviewed by Ossy.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109893 => 109894)
--- trunk/Tools/ChangeLog 2012-03-06 11:31:04 UTC (rev 109893)
+++ trunk/Tools/ChangeLog 2012-03-06 11:51:17 UTC (rev 109894)
@@ -1,3 +1,16 @@
+2012-03-06 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Make sure clean builds are followed by make qmake && make if needed
+
+ On non-GNUmake systems we have to run make qmake so that the generated
+ sources are generated before we run qmake on the target pro files. This
+ is achieved by using the 'incremental' target.
+
+ Reviewed by Ossy.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+
2012-03-06 Filip Pizlo <fpi...@apple.com>
DumpRenderTree should support preciseTime()
Modified: trunk/Tools/Scripts/webkitdirs.pm (109893 => 109894)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-06 11:31:04 UTC (rev 109893)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-06 11:51:17 UTC (rev 109894)
@@ -2191,6 +2191,9 @@
# to run config tests and generate the removed Tools/qmake/.qmake.cache again.
qtFeatureDefaults(\@buildArgs);
#}
+
+ # Still trigger an incremental build
+ $buildHint = "incremental";
}
# Save config up-front so we can detect changes to the build config even
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
