diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-04 14:49:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-05 17:29:46 +0100 |
| commit | 621b0e206268b0505971feb5722d803f01e6778f (patch) | |
| tree | af5fb365ce0bc2cda00041f78112b9ccc863a0cd /tools/configure/configureapp.cpp | |
| parent | 3aee20d4ab05777eb8aca5a5af80f79f79c64812 (diff) | |
move QT_{SOURCE,BUILD}_TREE back to .qmake.cache
they cannot be legally used outside qtbase - it's the antithesis of
modularization.
Change-Id: I847844ea0ddce599f130f396d68cb61fa8f34135
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7937573e05..57fbb3ae42 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2771,7 +2771,8 @@ void Configure::generateCachefile() if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. QTextStream cacheStream(&cacheFile); - // nothing left here + cacheStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl; + cacheStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl; cacheStream.flush(); cacheFile.close(); @@ -2782,9 +2783,6 @@ void Configure::generateCachefile() if (moduleFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. QTextStream moduleStream(&moduleFile); - moduleStream << "#paths" << endl; - moduleStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl; - moduleStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl; moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl << endl; if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") |