configure: delete some dead code and outdated comments

Change-Id: I764a9b383176e1fe9573790547ce0e12d1f88261
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 0 insertions, 24 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d9d247dbae..870bf3d368 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -173,12 +173,6 @@ QString Configure::formatPath(const QString &path)
     return ret;
 }
 
-// #### somehow I get a compiler error about vc++ reaching the nesting limit without
-// undefining the ansi for scoping.
-#ifdef for
-#undef for
-#endif
-
 void Configure::parseCmdLine()
 {
     sourcePathMangled = sourcePath;
@@ -599,16 +593,6 @@ void Configure::generateQDevicePri()
         dictionary[ "DONE" ] = "error";
 }
 
-QString Configure::formatConfigPath(const char *var)
-{
-    QString val = dictionary[var];
-    if (QFileInfo(val).isRelative()) {
-        QString pfx = dictionary["QT_INSTALL_PREFIX"];
-        val = (val == ".") ? pfx : QDir(pfx).absoluteFilePath(val);
-    }
-    return QDir::toNativeSeparators(val);
-}
-
 void Configure::generateHeaders()
 {
     if (dictionary["SYNCQT"] == "auto")
@@ -882,7 +866,6 @@ void Configure::buildQmake()
                        << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl;
                 if (dictionary[ "QMAKESPEC" ].startsWith("win32-g++")) {
                     stream << "QMAKESPEC = $(SOURCE_PATH)\\mkspecs\\" << dictionary[ "QMAKESPEC" ] << endl
-                           << "EXTRA_CFLAGS = -DUNICODE -ffunction-sections" << endl
                            << "EXTRA_CXXFLAGS = -std=c++11 -DUNICODE -ffunction-sections" << endl
                            << "EXTRA_LFLAGS = -Wl,--gc-sections" << endl
                            << "QTOBJS = qfilesystemengine_win.o \\" << endl
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index b1c6ea9181..c8d4d3df53 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -88,8 +88,6 @@ private:
     void saveCmdLine();
 
     void applySpecSpecifics();
-
-    QString formatConfigPath(const char *var);
 };
 
 class FileWriter : public QTextStream
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 6cc350acc5..17f44c12f7 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -62,7 +62,6 @@ struct CompilerInfo{
     const char *executable;
 } compiler_info[] = {
     // The compilers here are sorted in a reversed-preferred order
-    {CC_BORLAND, "Borland C++",                                                    0, "bcc32.exe"},
     {CC_MINGW,   "MinGW (Minimalist GNU for Windows)",                             0, "g++.exe"},
     {CC_INTEL,   "Intel(R) C++ Compiler for 32-bit applications",                  0, "icl.exe"}, // xilink.exe, xilink5.exe, xilink6.exe, xilib.exe
     {CC_MSVC2012, "Microsoft (R) Visual Studio 2012 C/C++ Compiler (11.0)",        "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe
@@ -109,9 +108,6 @@ QString Environment::detectQMakeSpec()
     case CC_MINGW:
         spec = "win32-g++";
         break;
-    case CC_BORLAND:
-        spec = "win32-borland";
-        break;
     default:
         break;
     }
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index d14961b5ac..2ab5b00d1c 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -33,7 +33,6 @@ QT_BEGIN_NAMESPACE
 
 enum Compiler {
     CC_UNKNOWN = 0,
-    CC_BORLAND = 0x01,
     CC_MINGW   = 0x02,
     CC_INTEL   = 0x03,
     CC_MSVC2005 = 0x80,