summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-05-17 17:51:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-22 21:17:54 +0200
commitc21a1621cee0f3d16404e250d57bcec2704e2390 (patch)
treeb0908fc6d44f31fedaea8ed7597b6f68c525ed0e /tools/configure
parent62b4525d6f5025dbddb0a7dbd9514256eff3cd0f (diff)
purge buildkey-related dead code
Change-Id: I196dbe33b349d437450a5ea68befb3d6bfe1b574 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp46
-rw-r--r--tools/configure/configureapp.h1
-rw-r--r--tools/configure/main.cpp2
3 files changed, 0 insertions, 49 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 53e6a2de80..4f973a4398 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2388,52 +2388,6 @@ bool Configure::verifyConfiguration()
return true;
}
-/*
- Things that affect the Qt API/ABI:
- Options:
- minimal-config small-config medium-config large-config full-config
-
- Options:
- debug release
-
- Things that do not affect the Qt API/ABI:
- system-jpeg no-jpeg jpeg
- system-png no-png png
- system-zlib no-zlib zlib
- no-gif gif
- dll staticlib
-
- nocrosscompiler
- GNUmake
- largefile
- nis
- nas
- tablet
-
- X11 : x11sm xinerama xcursor xfixes xrandr xrender fontconfig xkb
- Embedded: embedded freetype
-*/
-void Configure::generateBuildKey()
-{
- QString spec = dictionary["QMAKESPEC"];
-
- QString compiler = "msvc"; // ICC is compatible
- if (spec.endsWith("-g++"))
- compiler = "mingw";
- else if (spec.endsWith("-borland"))
- compiler = "borland";
-
- // Build options which changes the Qt API/ABI
- QStringList build_options;
- if (!dictionary["QCONFIG"].isEmpty())
- build_options += dictionary["QCONFIG"] + "-config ";
- build_options.sort();
-
- // Sorted defines that start with QT_NO_
- QStringList build_defines = qmakeDefines.filter(QRegExp("^QT_NO_"));
- build_defines.sort();
-}
-
void Configure::generateSystemVars()
{
// Generate an empty .qmake.cache file for config.tests
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 85fc70d9e5..18e61b65ae 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -69,7 +69,6 @@ public:
void generateOutputVars();
void generateHeaders();
- void generateBuildKey();
void generateCachefile();
void displayConfig();
void generateMakefiles();
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index efb3a893b7..59eb690bd9 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -96,8 +96,6 @@ int runConfigure( int argc, char** argv )
if( !app.isDone() )
app.generateCachefile();
if( !app.isDone() )
- app.generateBuildKey();
- if( !app.isDone() )
app.generateConfigfiles();
// must be done after buildQmake()
if (!app.isDone())