simplify forwarding include() statement in default specs
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Tue, 18 Sep 2012 10:20:03 +0000 (12:20 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 19 Sep 2012 17:54:44 +0000 (19:54 +0200)
Change-Id: Ie584491a5f0355ef3f4457d9b4b9734e6e8fdc47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
tools/configure/configureapp.cpp

index 7b9f2a3..0c26bd4 100644 (file)
@@ -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) {