summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-31 10:44:44 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-08-31 19:16:38 (GMT)
commite3c0b388d92ccb3d06d924b499d90136de25e847 (patch)
tree546708e150921d4865d79cbe3a2a3925461bae7b /tools/configure
parentd8e3ed4926bf3529329d774a1c17cd0d45483de0 (diff)
downloadQt-e3c0b388d92ccb3d06d924b499d90136de25e847.zip
Qt-e3c0b388d92ccb3d06d924b499d90136de25e847.tar.gz
Qt-e3c0b388d92ccb3d06d924b499d90136de25e847.tar.bz2
fix windows build with -prefix
passing just a spec name to qmake is bogus, as it will try to find it in the install dir, which of course won't work before it is installed. so either pass nothing at all (when preparing the libraries, as .qmake.cache already contains the right path), or explicitly pass a full path (when building the host tools, as we have to override the spec here). Reviewed-by: mariusSO
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index e1d7275..09da581 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3612,7 +3612,10 @@ void Configure::buildHostTools()
// generate Makefile
QStringList args;
args << QDir::toNativeSeparators(buildPath + "/bin/qmake");
- args << "-spec" << dictionary["QMAKESPEC"] << "-r";
+ // override .qmake.cache because we are not cross-building these.
+ // we need a full path so that a build with -prefix will still find it.
+ args << "-spec" << QDir::toNativeSeparators(buildPath + "/mkspecs/" + dictionary["QMAKESPEC"]);
+ args << "-r";
args << "-o" << QDir::toNativeSeparators(toolBuildPath + "/Makefile");
QDir().mkpath(toolBuildPath);
@@ -3750,8 +3753,7 @@ void Configure::generateMakefiles()
printf("Generating Makefiles...\n");
generate = false; // Now Makefiles will be done
}
- args << "-spec";
- args << spec;
+ // don't pass -spec - .qmake.cache has it already
args << "-r";
args << (sourcePath + "/projects.pro");
args << "-o";