summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-12-17 09:37:52 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-12-17 11:38:56 (GMT)
commitb54efea2e97baac1d9442e829be2d6fb322c5085 (patch)
tree11373a194c0f57398b0ae2779f1cd5fa6b0885bb /tools
parent8dc7346e52d58efbacfee493c46df50920376bdf (diff)
downloadQt-b54efea2e97baac1d9442e829be2d6fb322c5085.zip
Qt-b54efea2e97baac1d9442e829be2d6fb322c5085.tar.gz
Qt-b54efea2e97baac1d9442e829be2d6fb322c5085.tar.bz2
Use relative include instead of absolute in default qmake.conf
Absolute include path breaks QtP releases which copy mkspecs under epoc32 and do not necessarily have the sources available in the original absolute path and can't patch the paths either at installation time. Task-number: QTBUG-16172 Reviewed-by: Oswald Buddenhagen
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index c967dad..915a56d 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3267,8 +3267,14 @@ void Configure::generateConfigfiles()
if (qmakeConfFile.open(QFile::WriteOnly | QFile::Text)) {
QTextStream qmakeConfStream;
qmakeConfStream.setDevice(&qmakeConfFile);
+ // While QMAKESPEC_ORIGINAL being relative or absolute doesn't matter for the
+ // primary use of this variable by qmake to identify the original mkspec, the
+ // variable is also used for few special cases where the absolute path is required.
+ // Conversely, the include of the original qmake.conf must be done using relative path,
+ // as some Qt binary deployments are done in a manner that doesn't allow for patching
+ // the paths at the installation time.
qmakeConfStream << "QMAKESPEC_ORIGINAL=" << pltSpec << endl << endl;
- qmakeConfStream << "include(" << pltSpec << "/qmake.conf)" << endl;
+ qmakeConfStream << "include(" << "../" << spec << "/qmake.conf)" << endl << endl;
qmakeConfStream.flush();
qmakeConfFile.close();
}