Title: [109862] trunk/Tools
- Revision
- 109862
- Author
- [email protected]
- Date
- 2012-03-05 22:31:34 -0800 (Mon, 05 Mar 2012)
Log Message
Unreviewed, rolling out r109733.
http://trac.webkit.org/changeset/109733
https://bugs.webkit.org/show_bug.cgi?id=80378
It broke Qt5 build system (Requested by Ossy on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-03-05
* Tools.pro:
* qmake/config.tests/gccdepends/empty.cpp: Removed.
* qmake/config.tests/gccdepends/gccdepends.pro: Removed.
* qmake/mkspecs/features/default_pre.prf:
* qmake/mkspecs/features/features.prf:
* qmake/mkspecs/features/unix/default_pre.prf:
* qmake/sync.profile:
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (109861 => 109862)
--- trunk/Tools/ChangeLog 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/ChangeLog 2012-03-06 06:31:34 UTC (rev 109862)
@@ -1,3 +1,19 @@
+2012-03-05 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r109733.
+ http://trac.webkit.org/changeset/109733
+ https://bugs.webkit.org/show_bug.cgi?id=80378
+
+ It broke Qt5 build system (Requested by Ossy on #webkit).
+
+ * Tools.pro:
+ * qmake/config.tests/gccdepends/empty.cpp: Removed.
+ * qmake/config.tests/gccdepends/gccdepends.pro: Removed.
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/features.prf:
+ * qmake/mkspecs/features/unix/default_pre.prf:
+ * qmake/sync.profile:
+
2012-03-05 Eric Seidel <[email protected]>
Update _javascript_Core files to use fully-qualified WTF include path
Modified: trunk/Tools/Tools.pro (109861 => 109862)
--- trunk/Tools/Tools.pro 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/Tools.pro 2012-03-06 06:31:34 UTC (rev 109862)
@@ -29,7 +29,6 @@
qmake/sync.profile \
qmake/config.tests/README \
qmake/config.tests/fontconfig/* \
- qmake/config.tests/gccdepends/* \
qmake/mkspecs/modules/* \
qmake/mkspecs/features/*.prf \
qmake/mkspecs/features/mac/*.prf \
Deleted: trunk/Tools/qmake/config.tests/gccdepends/empty.cpp ( => )
Deleted: trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro
===================================================================
--- trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro 2012-03-06 06:31:34 UTC (rev 109862)
@@ -1,12 +0,0 @@
-TEMPLATE = aux
-SOURCES += empty.cpp
-OBJECTS_DIR = obj
-QMAKE_CXXFLAGS += -MD
-
-test.commands = test -f $$OBJECTS_DIR/empty.d && test ! -f empty.d && touch $$basename(PWD)
-test.depends = $$OBJECTS_DIR/empty.o
-QMAKE_EXTRA_TARGETS += test
-
-default.target = all
-default.depends += test
-QMAKE_EXTRA_TARGETS += default
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (109861 => 109862)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-03-06 06:31:34 UTC (rev 109862)
@@ -7,15 +7,6 @@
load(functions)
-# Load results of config tests (only supported in Qt 5)
-haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
-
-unix:config_test_gccdepends {
- # 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
-}
-
# FIXME: In this case we probably want to exit early so that we
# don't load all of the custom build tweaks needlessly.
pro_file = $$_PRO_FILE_ # Checking the variable directly does not work
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109861 => 109862)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 06:31:34 UTC (rev 109862)
@@ -5,6 +5,9 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
+# Load results of config tests (only supported in Qt 5)
+haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
+
CONFIG(minimal) {
DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
}
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (109861 => 109862)
--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2012-03-06 06:31:34 UTC (rev 109862)
@@ -6,7 +6,10 @@
load(functions)
-haveQt(5): CONFIG += object_parallel_to_source
+# 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 object_parallel_to_source
# Expose if we are building inside Scratchbox
SBOX_CHECK = $$(_SBOX_DIR)
Modified: trunk/Tools/qmake/sync.profile (109861 => 109862)
--- trunk/Tools/qmake/sync.profile 2012-03-06 06:21:23 UTC (rev 109861)
+++ trunk/Tools/qmake/sync.profile 2012-03-06 06:31:34 UTC (rev 109862)
@@ -1,5 +1,4 @@
# This file is only used for config tests
%configtests = (
fontconfig => {},
- gccdepends => {},
);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
