1 files changed, 11 insertions, 42 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index faa9c1eb14..d2f26cfc15 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the tools applications of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -49,8 +41,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class MakeItem;
-
 class Configure
 {
 public:
@@ -73,7 +63,6 @@ public:
     void generateCachefile();
     void displayConfig();
     void generateMakefiles();
-    void appendMakeItem(int inList, const QString &item);
     void generateConfigfiles();
     void detectArch();
     void generateQConfigPri();
@@ -129,10 +118,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;
@@ -179,22 +164,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: