Title: [129007] trunk/Tools
- Revision
- 129007
- Author
- [email protected]
- Date
- 2012-09-19 08:05:15 -0700 (Wed, 19 Sep 2012)
Log Message
[Qt] Fix incremental builds with all-in-one-files and gccdepends
Reviewed by Tor Arne Vestbø.
Pass -MP to gcc when we use the gcc depends feature, to ensure that implicit rules
are not only created for header files but also for .cpp files. AllInOne.cpp files
include other .cpp files, and when those are removed we need those dummy rules to
avoid a "No rule to make Foo.cpp required by AllInOne.o" error.
* qmake/config.tests/gccdepends/empty.cpp:
(main):
* qmake/config.tests/gccdepends/gccdepends.pro:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129006 => 129007)
--- trunk/Tools/ChangeLog 2012-09-19 14:52:08 UTC (rev 129006)
+++ trunk/Tools/ChangeLog 2012-09-19 15:05:15 UTC (rev 129007)
@@ -1,3 +1,19 @@
+2012-09-19 Simon Hausmann <[email protected]>
+
+ [Qt] Fix incremental builds with all-in-one-files and gccdepends
+
+ Reviewed by Tor Arne Vestbø.
+
+ Pass -MP to gcc when we use the gcc depends feature, to ensure that implicit rules
+ are not only created for header files but also for .cpp files. AllInOne.cpp files
+ include other .cpp files, and when those are removed we need those dummy rules to
+ avoid a "No rule to make Foo.cpp required by AllInOne.o" error.
+
+ * qmake/config.tests/gccdepends/empty.cpp:
+ (main):
+ * qmake/config.tests/gccdepends/gccdepends.pro:
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-09-19 Rick Byers <[email protected]>
Do touch adjustment on GestureTapDown
Modified: trunk/Tools/qmake/config.tests/gccdepends/empty.cpp (129006 => 129007)
--- trunk/Tools/qmake/config.tests/gccdepends/empty.cpp 2012-09-19 14:52:08 UTC (rev 129006)
+++ trunk/Tools/qmake/config.tests/gccdepends/empty.cpp 2012-09-19 15:05:15 UTC (rev 129007)
@@ -0,0 +1,2 @@
+
+int main() { return 0; }
Modified: trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro (129006 => 129007)
--- trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-09-19 14:52:08 UTC (rev 129006)
+++ trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-09-19 15:05:15 UTC (rev 129007)
@@ -1,6 +1,8 @@
-TEMPLATE = aux
+TEMPLATE = app
OBJECTS_DIR = obj
-QMAKE_CXXFLAGS += -MD
+CONFIG += GNUmake gcc_MD_depends
+QMAKE_CXXFLAGS += -MP
+TARGET = empty
base_filename = empty
object_file = $$OBJECTS_DIR/$${base_filename}.o
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (129006 => 129007)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-19 14:52:08 UTC (rev 129006)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-19 15:05:15 UTC (rev 129007)
@@ -87,6 +87,9 @@
# We have a compiler that supports the -MD option (and neither
# teambuilder nor icecream is messing up the .d file output).
CONFIG += GNUmake gcc_MD_depends
+ # This should really be added to qmake, but for now we add it here.
+ QMAKE_CXXFLAGS += -MP
+ QMAKE_CFLAGS += -MP
}
!haveQt(5):!recursive_include: error("Building WebKit with Qt versions older than 5.0 is not supported.")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
