diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-22 19:52:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 00:46:35 +0200 |
commit | 989cada8cc6c4f12e30c28bde3edac8a3833680f (patch) | |
tree | 84921030db9296903a17351da4961b121f588010 /tools | |
parent | 9315497d2af6d6944792bbbffd61582c7061ef4c (diff) |
don't compile the host tools for wince already in configure
qmake can now produce proper mixed-target projects
Change-Id: I797f055f6e1487b9aefb75eee91d6c2cc4e6e56e
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 65 | ||||
-rw-r--r-- | tools/configure/configureapp.h | 1 | ||||
-rw-r--r-- | tools/configure/main.cpp | 2 |
3 files changed, 0 insertions, 68 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f38ee50032..9757ade1c5 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3641,71 +3641,6 @@ void Configure::buildQmake() } #endif -void Configure::buildHostTools() -{ - if (dictionary[ "NOPROCESS" ] == "yes") - dictionary[ "DONE" ] = "yes"; - - if (!dictionary.contains("XQMAKESPEC")) - return; - - QString pwd = QDir::currentPath(); - QStringList hostToolsDirs; - hostToolsDirs - << "src/tools"; - - for (int i = 0; i < hostToolsDirs.count(); ++i) { - cout << "Creating " << hostToolsDirs.at(i) << " ..." << endl; - QString toolBuildPath = buildPath + "/" + hostToolsDirs.at(i); - QString toolSourcePath = sourcePath + "/" + hostToolsDirs.at(i); - - // generate Makefile - QStringList args; - args << QDir::toNativeSeparators(buildPath + "/bin/qmake"); - // 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); - QDir::setCurrent(toolSourcePath); - int exitCode = Environment::execute(args, QStringList(), QStringList()); - if (exitCode) { - cout << "qmake failed, return code " << exitCode << endl << endl; - dictionary["DONE"] = "error"; - break; - } - - // build app - args.clear(); - args += dictionary["MAKE"]; - QDir::setCurrent(toolBuildPath); - exitCode = Environment::execute(args, QStringList(), QStringList()); - if (exitCode) { - args.clear(); - args += dictionary["MAKE"]; - args += "clean"; - exitCode = Environment::execute(args, QStringList(), QStringList()); - if (exitCode) { - cout << "Cleaning " << hostToolsDirs.at(i) << " failed, return code " << exitCode << endl << endl; - dictionary["DONE"] = "error"; - break; - } else { - args.clear(); - args += dictionary["MAKE"]; - exitCode = Environment::execute(args, QStringList(), QStringList()); - if (exitCode) { - cout << "Building " << hostToolsDirs.at(i) << " failed, return code " << exitCode << endl << endl; - dictionary["DONE"] = "error"; - break; - } - } - } - } - QDir::setCurrent(pwd); -} - void Configure::findProjects(const QString& dirName) { if (dictionary[ "NOPROCESS" ] == "no") { diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 6b9d9b7f52..c16b9e2ad3 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -74,7 +74,6 @@ public: void generateCachefile(); void displayConfig(); void buildQmake(); - void buildHostTools(); #endif void generateMakefiles(); void appendMakeItem(int inList, const QString &item); diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 08cd691875..794793b52f 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -102,8 +102,6 @@ int runConfigure( int argc, char** argv ) if( !app.isDone() ) app.generateMakefiles(); if( !app.isDone() ) - app.buildHostTools(); - if( !app.isDone() ) app.showSummary(); if( !app.isOk() ) return 2; |