[Qt] Fix support for silent builds

Reviewed by Tor Arne Vestbø.

The .qmake.conf file in Qt modules usually contains a load(qt_build_config), which
ends up loading qmodule.pri, which contains the CONFIG += silent if Qt was configured
with -silent.

* .qmake.conf:

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

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

diff --git a/ChangeLog b/ChangeLog
index bc833c588d715c9f36c2803a27381151355289eb..59c83a9824e55ede32ffd4262771981b9ebdce06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-10-16  Simon Hausmann  <simon.hausmann@digia.com>
+
+        [Qt] Fix support for silent builds
+
+        Reviewed by Tor Arne Vestbø.
+
+        The .qmake.conf file in Qt modules usually contains a load(qt_build_config), which
+        ends up loading qmodule.pri, which contains the CONFIG += silent if Qt was configured
+        with -silent.
+
+        * .qmake.conf:
+
 2012-10-16  Simon Hausmann  <simon.hausmann@digia.com>, Tor Arne Vestbø <tor.arne.vestbo@digia.com>
 
         [Qt] Add logic for triggering clean builds on changes to build system files