summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-05-17 17:53:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-22 21:17:59 +0200
commitf18b0810be29acbebeab86e7571d1cb4062ee763 (patch)
tree2eb4f958f06c2892c38b8cab5fbba68016d90a4f /tools/configure
parent836260974fb65bf3826d41bd6ffe6af1102de608 (diff)
reality adjustment: rename generateSystemVars() => prepareConfigTests()
Change-Id: I3f9cd8b8cdb54d682d0207f28168f4e518b98280 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp2
-rw-r--r--tools/configure/configureapp.h2
-rw-r--r--tools/configure/main.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index bbc27e36d8..bb314280cf 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2376,7 +2376,7 @@ bool Configure::verifyConfiguration()
return true;
}
-void Configure::generateSystemVars()
+void Configure::prepareConfigTests()
{
// Generate an empty .qmake.cache file for config.tests
QDir buildDir(buildPath);
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 18e61b65ae..3014e409f9 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -76,7 +76,7 @@ public:
void generateConfigfiles();
void detectArch();
void generateQConfigPri();
- void generateSystemVars();
+ void prepareConfigTests();
void showSummary();
QString firstLicensePath();
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 59eb690bd9..3a6390d5c2 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -78,7 +78,7 @@ int runConfigure( int argc, char** argv )
if (!app.isOk())
return 3;
- app.generateSystemVars();
+ app.prepareConfigTests();
if (!app.isOk())
return 3;