Title: [102452] trunk/Tools
- Revision
- 102452
- Author
- ves...@webkit.org
- Date
- 2011-12-09 06:48:05 -0800 (Fri, 09 Dec 2011)
Log Message
[Qt] Use new qmake option in Qt5 to prevent dependency issues with GNUmake
The GNUmake + gcc_MD_depends options together produce .d files using GCC, but
this failed when moving files in the source tree, as the .d file would contain
stale dependencies on the old source file location. By keeping the object files
(and hence the depdendency files) in a proper tree structure inside the objects
directory we can prevent this failure.
A side benefit is that we can also have objects with the same name inside the
same project.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (102451 => 102452)
--- trunk/Tools/ChangeLog 2011-12-09 14:01:34 UTC (rev 102451)
+++ trunk/Tools/ChangeLog 2011-12-09 14:48:05 UTC (rev 102452)
@@ -1,3 +1,20 @@
+2011-12-09 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Use new qmake option in Qt5 to prevent dependency issues with GNUmake
+
+ The GNUmake + gcc_MD_depends options together produce .d files using GCC, but
+ this failed when moving files in the source tree, as the .d file would contain
+ stale dependencies on the old source file location. By keeping the object files
+ (and hence the depdendency files) in a proper tree structure inside the objects
+ directory we can prevent this failure.
+
+ A side benefit is that we can also have objects with the same name inside the
+ same project.
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/unix/default_pre.prf:
+
2011-12-09 Csaba Osztrogonác <o...@webkit.org>
Unreviewed. Update unit test after r102412.
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (102451 => 102452)
--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2011-12-09 14:01:34 UTC (rev 102451)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2011-12-09 14:48:05 UTC (rev 102452)
@@ -9,7 +9,7 @@
# Assume we use GNU make and a non-ancient GCC (compatible)
# compiler that supports the -MD option. Relies on changes
# introduced in Qt 5 to work correctly.
-haveQt(5): CONFIG += GNUmake gcc_MD_depends
+haveQt(5): CONFIG += GNUmake gcc_MD_depends object_parallel_to_source
# Expose if we are building inside Scratchbox
SBOX_CHECK = $$(_SBOX_DIR)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
