diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-17 19:24:35 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-13 18:55:25 +0000 |
commit | 2dcc1a8e4636c754d51370c84a0aa8270e412389 (patch) | |
tree | a17022f2c383b0dc6a0947fff90dfb1342f20c68 /tools | |
parent | 80e63223f80643a93255cde9e0a4e82c705b2262 (diff) |
move preparation of configure test build dir to qmake-based system
Change-Id: I650fb92cfa858bf6d7ff5756aa0efe182f036a55
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 20 | ||||
-rw-r--r-- | tools/configure/configureapp.h | 1 | ||||
-rw-r--r-- | tools/configure/main.cpp | 5 |
3 files changed, 0 insertions, 26 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index fc66220335..cfba57272f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -93,7 +93,6 @@ Configure::Configure(int& argc, char** argv) QDir(buildPath).mkpath("bin"); buildDir.mkpath("mkspecs"); - buildDir.mkpath("config.tests"); } dictionary[ "QT_INSTALL_PREFIX" ] = installPath; @@ -479,25 +478,6 @@ void Configure::parseCmdLine() } } -void Configure::prepareConfigTests() -{ - // Generate an empty .qmake.cache file for config.tests - QDir buildDir(buildPath); - bool success = true; - if (!buildDir.exists("config.tests")) - success = buildDir.mkdir("config.tests"); - - QString fileName(buildPath + "/config.tests/.qmake.cache"); - QFile cacheFile(fileName); - success &= cacheFile.open(QIODevice::WriteOnly); - cacheFile.close(); - - if (!success) { - cout << "Failed to create file " << qPrintable(QDir::toNativeSeparators(fileName)) << endl; - dictionary[ "DONE" ] = "error"; - } -} - void Configure::generateQDevicePri() { FileWriter deviceStream(buildPath + "/mkspecs/qdevice.pri"); diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index b007f3c487..8d11f07457 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -52,7 +52,6 @@ public: void generateHeaders(); void generateQDevicePri(); - void prepareConfigTests(); bool isDone(); bool isOk(); diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index f6c2722529..3fce934da5 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -63,11 +63,6 @@ int runConfigure( int argc, char** argv ) if (!app.isOk()) return 3; - // Prepare the config test build directory. - app.prepareConfigTests(); - if (!app.isOk()) - return 3; - // run qmake based configure app.configure(); if (!app.isOk()) |