diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-23 20:45:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-01 22:27:09 +0100 |
| commit | 589a18597f9d513e3b46f975844282624c792acc (patch) | |
| tree | 3dbb34b4a800b00423c7e378ed83117c31fb67e7 /tools/configure/configureapp.cpp | |
| parent | b94cfa423610e5601674f713303db2cc264452cd (diff) | |
move remaining configure'd CONFIG flags to qmodule.pri
so they are uniformly available to all modules.
Change-Id: I734f703c5923c42cb26f1456ed960cecc01c4b41
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f26a07a4ed..ca671b53a0 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2711,7 +2711,6 @@ void Configure::generateCachefile() for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) { cacheStream << (*var) << endl; } - cacheStream << "CONFIG += " << qmakeConfig.join(' ') << "no_private_qt_headers_warning QTDIR_build" << endl; cacheStream.flush(); cacheFile.close(); @@ -2751,7 +2750,8 @@ void Configure::generateCachefile() if (!dictionary["DECORATIONS"].isEmpty()) moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; - moduleStream << "CONFIG += create_prl link_prl"; + moduleStream << "CONFIG += " << qmakeConfig.join(' ') + << " create_prl link_prl no_private_qt_headers_warning QTDIR_build"; if (dictionary[ "SSE2" ] == "yes") moduleStream << " sse2"; if (dictionary[ "SSE3" ] == "yes") |