diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-09-18 22:01:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 17:42:40 +0200 |
| commit | 6226fcdc3e4ace4636c58778ef53fbf69f46c36e (patch) | |
| tree | fed05f2fbd0a4b34c6a2dfb1eacfd3ddce33fb66 /tools/configure | |
| parent | a2e4b7a92fad04fc6c73a71ede003ccbdf7b5305 (diff) | |
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>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b7442ebc4e..81daecef2d 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; } |