From 0d463c05fc4f2e79e5a4e5a5382a1e6ed5d2615e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 May 2013 16:29:11 +0200 Subject: don't copy mkspecs to build directory instead, teach qmake to use the mkspecs dir from the source dir as well. Change-Id: I9edac11f8997fcb0594d0a67419d4733dd4ed86b Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 44498b6ccb..6457f742a9 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -160,13 +160,7 @@ Configure::Configure(int& argc, char** argv) cout << "Preparing build tree..." << endl; QDir(buildPath).mkpath("bin"); - //copy the mkspecs buildDir.mkpath("mkspecs"); - if (!Environment::cpdir(sourcePath + "/mkspecs", buildPath + "/mkspecs")){ - cout << "Couldn't copy mkspecs!" << sourcePath << " " << buildPath << endl; - dictionary["DONE"] = "error"; - return; - } buildDir.mkpath("doc"); if (!Environment::cpdir(sourcePath + "/doc/global", buildPath + "/doc/global")) { @@ -3897,6 +3891,9 @@ void Configure::buildQmake() QTextStream confStream(&confFile); confStream << "[EffectivePaths]" << endl << "Prefix=.." << endl; + if (sourcePath != buildPath) + confStream << "[EffectiveSourcePaths]" << endl + << "Prefix=" << sourcePath << endl; confStream.flush(); confFile.close(); -- cgit v1.2.3