From c21a1621cee0f3d16404e250d57bcec2704e2390 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 17 May 2013 17:51:13 +0200
Subject: purge buildkey-related dead code

Change-Id: I196dbe33b349d437450a5ea68befb3d6bfe1b574
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 tools/configure/configureapp.cpp | 46 ----------------------------------------
 tools/configure/configureapp.h   |  1 -
 tools/configure/main.cpp         |  2 --
 3 files changed, 49 deletions(-)

(limited to 'tools/configure')

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
@@ -95,8 +95,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()
-- 
cgit v1.2.3