Unreviewed, rolling out r131436.

http://trac.webkit.org/changeset/131436

Broke various Qt bots strangely

* .qmake.conf:

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

diff --git a/.qmake.conf b/.qmake.conf
index 1889acc259c515c1a3d82182fa0ee9ca42ffde91..78f46ce6a9113c6447b063fb04bd657d39fe36b4 100644 (file)
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1 @@
 QMAKEPATH += $$PWD/Tools/qmake $$shadowed($$PWD/Tools/qmake)
-load(qt_build_config)

diff --git a/ChangeLog b/ChangeLog
index 3d1c823e4792fa7fc51dafeab286b9d36d05c31e..ef0dbd8e56b1b2e631ab090c766362cda8067727 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-16  Simon Hausmann  <simon.hausmann@digia.com>
+
+        Unreviewed, rolling out r131436.
+        http://trac.webkit.org/changeset/131436
+
+        Broke various Qt bots strangely
+
+        * .qmake.conf:
+
 2012-10-16  Simon Hausmann  <simon.hausmann@digia.com>
 
         [Qt] Fix support for silent builds