diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-25 21:04:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 15:38:06 +0100 |
| commit | d7a0d243a984f032a8f838e7b44297eac81ef190 (patch) | |
| tree | 7c1013364658b76275a07e53f4e2b919aa14ebd9 /tools | |
| parent | f37ed85a55f977159ea79d6ecbefd857d7d6cb63 (diff) | |
validate qconfig-*.h against qfeatures.txt
Change-Id: I59b7e30cfaa2b1bf2c5d4a3e04b5169f3c9439b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index cc35b425a6..0fd35dd2fa 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2860,6 +2860,11 @@ void Configure::generateCachefile() moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl; if (!skipModules.isEmpty()) moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl; + QString qcpath = dictionary["QCONFIG_PATH"]; + QString qlpath = sourcePath + "/src/corelib/global/"; + if (qcpath.startsWith(qlpath)) + qcpath.remove(0, qlpath.length()); + moduleStream << "QT_QCONFIG_PATH = " << qcpath << endl; moduleStream << endl; moduleStream << "host_build {" << endl; |