diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-08 16:29:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-12 16:27:24 +0200 |
| commit | 0d463c05fc4f2e79e5a4e5a5382a1e6ed5d2615e (patch) | |
| tree | 21f4fdd10b50396a5531ad0faf158c4a7240a95d /tools/configure | |
| parent | d795e9ff5fb676115a5c4eb9604c35cedd3fb186 (diff) | |
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 <joerg.bornemann@digia.com>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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(); |