Title: [129092] trunk/Tools
- Revision
- 129092
- Author
- [email protected]
- Date
- 2012-09-19 22:50:25 -0700 (Wed, 19 Sep 2012)
Log Message
Unreviewed, rolling out r129007.
http://trac.webkit.org/changeset/129007
https://bugs.webkit.org/show_bug.cgi?id=97172
It broke the build on the Qt bots (Requested by Ossy on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2012-09-19
* qmake/config.tests/gccdepends/empty.cpp:
* qmake/config.tests/gccdepends/gccdepends.pro:
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (129091 => 129092)
--- trunk/Tools/ChangeLog 2012-09-20 05:14:16 UTC (rev 129091)
+++ trunk/Tools/ChangeLog 2012-09-20 05:50:25 UTC (rev 129092)
@@ -1,3 +1,16 @@
+2012-09-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r129007.
+ http://trac.webkit.org/changeset/129007
+ https://bugs.webkit.org/show_bug.cgi?id=97172
+
+ It broke the build on the Qt bots (Requested by Ossy on
+ #webkit).
+
+ * qmake/config.tests/gccdepends/empty.cpp:
+ * qmake/config.tests/gccdepends/gccdepends.pro:
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-09-19 Ryosuke Niwa <[email protected]>
run-perf-tests should record indivisual value instead of statistics
Deleted: trunk/Tools/qmake/config.tests/gccdepends/empty.cpp (129091 => 129092)
--- trunk/Tools/qmake/config.tests/gccdepends/empty.cpp 2012-09-20 05:14:16 UTC (rev 129091)
+++ trunk/Tools/qmake/config.tests/gccdepends/empty.cpp 2012-09-20 05:50:25 UTC (rev 129092)
@@ -1,2 +0,0 @@
-
-int main() { return 0; }
Modified: trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro (129091 => 129092)
--- trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-09-20 05:14:16 UTC (rev 129091)
+++ trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-09-20 05:50:25 UTC (rev 129092)
@@ -1,8 +1,6 @@
-TEMPLATE = app
+TEMPLATE = aux
OBJECTS_DIR = obj
-CONFIG += GNUmake gcc_MD_depends
-QMAKE_CXXFLAGS += -MP
-TARGET = empty
+QMAKE_CXXFLAGS += -MD
base_filename = empty
object_file = $$OBJECTS_DIR/$${base_filename}.o
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (129091 => 129092)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-20 05:14:16 UTC (rev 129091)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-09-20 05:50:25 UTC (rev 129092)
@@ -87,9 +87,6 @@
# 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
