diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 2 insertions, 5 deletions
@@ -6126,7 +6126,6 @@ fi CACHEFILE="$outpath/.qmake.cache" [ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" cat >>"$CACHEFILE.tmp" <<EOF -#paths QT_SOURCE_TREE = \$\$quote($relpath) QT_BUILD_TREE = \$\$quote($outpath) EOF 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") |