summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
authorJason Barron <jason.barron@digia.com>2012-10-29 10:17:33 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-30 12:53:46 +0100
commit57fed47ac042f6dd3d5a381ce6b9e5906648ca86 (patch)
tree62b1c3bc9752c932b4dea11295b94c78f23f66f2 /tools/configure/configureapp.cpp
parenta48508cd766b056d3cb5b6502cf269a8293bb5a5 (diff)
Generate a .qmake.cache in config.tests from configure.exe.
We need to generate a .qmake.cache file in the config.tests directory on Windows to ensure that the config.tests can actually be compiled before the qmodule.pri is created. Task-number: QTBUG-27708 Change-Id: I8d9397a8cbdb2aa19a5318497177d76049f9fa91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r--tools/configure/configureapp.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 113ebf7692..472563a760 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2312,6 +2312,25 @@ void Configure::generateBuildKey()
build_defines.sort();
}
+void Configure::generateSystemVars()
+{
+ // 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::generateOutputVars()
{
// Generate variables for output