From 47184566171ccdc1a4abb1b1f9ece496da920169 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 19 Jun 2014 16:43:15 +0200
Subject: remove dead code relating MakeItem

Change-Id: I413f038391dba02a22242eafef4a946f81babfca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 tools/configure/configureapp.cpp | 15 ---------------
 tools/configure/configureapp.h   | 23 -----------------------
 2 files changed, 38 deletions(-)

(limited to 'tools/configure')

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7c2a38292b..f1010aea34 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -311,11 +311,6 @@ Configure::Configure(int& argc, char** argv)
 
 Configure::~Configure()
 {
-    for (int i=0; i<3; ++i) {
-        QList<MakeItem*> items = makeList[i];
-        for (int j=0; j<items.size(); ++j)
-            delete items[j];
-    }
 }
 
 QString Configure::formatPath(const QString &path)
@@ -4133,16 +4128,6 @@ void Configure::buildQmake()
 
 }
 
-void Configure::appendMakeItem(int inList, const QString &item)
-{
-    QString dir;
-    if (item != "src")
-        dir = "/" + item;
-    dir.prepend("/src");
-    makeList[inList].append(new MakeItem(sourcePath + dir,
-        item + ".pro", buildPath + dir + "/Makefile", Lib));
-}
-
 void Configure::generateMakefiles()
 {
         QString pwd = QDir::currentPath();
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 98e4912eaa..9c14d5e63b 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -49,8 +49,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class MakeItem;
-
 class Configure
 {
 public:
@@ -73,7 +71,6 @@ public:
     void generateCachefile();
     void displayConfig();
     void generateMakefiles();
-    void appendMakeItem(int inList, const QString &item);
     void generateConfigfiles();
     void detectArch();
     void generateQConfigPri();
@@ -129,10 +126,6 @@ private:
 
     QStringList qmakeVars;
     QStringList qmakeDefines;
-    //  makeList[0] for qt and qtmain
-    //  makeList[1] for subdirs and libs
-    //  makeList[2] for the rest
-    QList<MakeItem*> makeList[3];
     QStringList qmakeIncludes;
     QStringList qmakeLibs;
     QString opensslLibs;
@@ -177,22 +170,6 @@ private:
     void applySpecSpecifics();
 };
 
-class MakeItem
-{
-public:
-    MakeItem( const QString &d, const QString &p, const QString &t, Configure::ProjectType qt )
-        : directory( d ),
-          proFile( p ),
-          target( t ),
-          qmakeTemplate( qt )
-    { }
-
-    QString directory;
-    QString proFile;
-    QString target;
-    Configure::ProjectType qmakeTemplate;
-};
-
 class FileWriter : public QTextStream
 {
 public:
-- 
cgit v1.2.3