From 6226fcdc3e4ace4636c58778ef53fbf69f46c36e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 18 Sep 2012 22:01:10 +0200
Subject: [PATCH] add a .qmake.conf file which load()s qt_build_config

that way we don't have to auto-generate code for that in the configures.

note that we now load qt_build_config.prf instead of just qmodule.pri,
which means that exceptions_off is set everywhere. we forcibly re-enable
them for testcases to minimize the deviation from default 3rd party usage.
testlib selftests are not qt testcases, so the one that needs exceptions
needs to enable them explicitly.

Change-Id: I1b9360bb11f2e80c92a2b63a7c45991ad17fda1b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 .qmake.conf                                                 | 1 +
 configure                                                   | 1 -
 mkspecs/features/qt_build_config.prf                        | 5 +++--
 mkspecs/features/testcase.prf                               | 6 ++++++
 .../testlib/selftests/exceptionthrow/exceptionthrow.pro     | 1 +
 tools/configure/configureapp.cpp                            | 2 --
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 .qmake.conf

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 00000000000..42ba8e45fb1
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1 @@
+load(qt_build_config)
diff --git a/configure b/configure
index 684948e3856..643b64024f2 100755
--- a/configure
+++ b/configure
@@ -6114,7 +6114,6 @@ cat >>"$CACHEFILE.tmp" <<EOF
 QT_SOURCE_TREE = \$\$quote($relpath)
 QT_BUILD_TREE = \$\$quote($outpath)
 
-include(\$\$PWD/mkspecs/qmodule.pri)
 CONFIG += fix_output_dirs no_private_qt_headers_warning QTDIR_build
 
 EOF
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 6b412291bb2..a2ad4429c19 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -15,5 +15,6 @@ mac {
    }
 }
 
-# Qt modules get compiled without exceptions enabled by default
-CONFIG += exceptions_off
+# Qt modules get compiled without exceptions enabled by default.
+# However, testcases should be still built with exceptions.
+CONFIG += exceptions_off testcase_exceptions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index 64065018f30..faf4eeb124a 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -1,5 +1,11 @@
 have_target {
 
+# qt_build_config.prf disables execptions for all Qt modules which don't
+# explicitly turn it on again, while the qmake default is to build with
+# exceptions. As we want tests to be built like 3rd party applications,
+# qt_build_config tells us to re-enable exceptions here.
+testcase_exceptions: CONFIG += exceptions
+
 check.files                =
 check.path                 = .
 
diff --git a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
index fa4e9a7602f..76000ce7dbe 100644
--- a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
+++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
@@ -3,6 +3,7 @@ QT = core testlib
 
 mac:CONFIG -= app_bundle
 CONFIG -= debug_and_release_target
+CONFIG += exceptions
 
 TARGET = exceptionthrow
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b7442ebc4ec..81daecef2d4 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2670,8 +2670,6 @@ void Configure::generateCachefile()
     if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
         QTextStream cacheStream(&cacheFile);
 
-        cacheStream << "include($$PWD/mkspecs/qmodule.pri)" << endl;
-
         for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
             cacheStream << (*var) << endl;
         }