summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-09-18 12:20:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-19 19:54:44 +0200
commit0fae8b50f7c37fad7f93845495199891d6191291 (patch)
tree26179adc8a1bfc24f252f4e09174cd9b392bfab9
parent04cd23428a4f2cfa5ee02b70f2086ff832aae925 (diff)
simplify forwarding include() statement in default specs
Change-Id: Ie584491a5f0355ef3f4457d9b4b9734e6e8fdc47 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7b9f2a3216..0c26bd4226 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3011,7 +3011,7 @@ bool Configure::copySpec(const char *name, const char *pfx, const QString &spec)
fileStream.setDevice(&qfile);
QString srcSpec = buildPath + "/mkspecs/" + spec; // We copied it to the build dir
fileStream << "QMAKESPEC_ORIGINAL = " << formatPath(srcSpec) << endl;
- fileStream << "include(" << formatPath(QDir(defSpec).relativeFilePath(srcSpec + "/qmake.conf")) << ")" << endl;
+ fileStream << "include($$QMAKESPEC_ORIGINAL/qmake.conf)" << endl;
qfile.close();
}
if (qfile.error() != QFile::NoError) {