Unreviewed, rolling out r109733.
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Mar 2012 06:31:34 +0000 (06:31 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Mar 2012 06:31:34 +0000 (06:31 +0000)
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 <webkit.review.bot@gmail.com> 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@109862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Tools.pro
Tools/qmake/config.tests/gccdepends/empty.cpp [deleted file]
Tools/qmake/config.tests/gccdepends/gccdepends.pro [deleted file]
Tools/qmake/mkspecs/features/default_pre.prf
Tools/qmake/mkspecs/features/features.prf
Tools/qmake/mkspecs/features/unix/default_pre.prf
Tools/qmake/sync.profile

index 96ffbb9..eae6de2 100644 (file)
@@ -1,3 +1,19 @@
+2012-03-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <eric@webkit.org>
 
         Update JavaScriptCore files to use fully-qualified WTF include path
index b43c26f..4e7414f 100644 (file)
@@ -29,7 +29,6 @@ OTHER_FILES = \
     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 \
diff --git a/Tools/qmake/config.tests/gccdepends/empty.cpp b/Tools/qmake/config.tests/gccdepends/empty.cpp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/Tools/qmake/config.tests/gccdepends/gccdepends.pro b/Tools/qmake/config.tests/gccdepends/gccdepends.pro
deleted file mode 100644 (file)
index 1870304..0000000
+++ /dev/null
@@ -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
index e80e4cf..776728d 100644 (file)
@@ -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
index c78d918..d9044ef 100644 (file)
@@ -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
 }
index 91b1778..0e4e38d 100644 (file)
@@ -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)
index f501ae3..60c7f4c 100644 (file)
@@ -1,5 +1,4 @@
 # This file is only used for config tests
 %configtests = (
     fontconfig => {},
-    gccdepends => {},
 );