Changeset 561 for trunk/tools/configure

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/configure/configure.pro (modified) (4 diffs)
• tools/configure/configure_pch.h (modified) (3 diffs)
• tools/configure/configureapp.cpp (modified) (83 diffs)
• tools/configure/configureapp.h (modified) (4 diffs)
• tools/configure/environment.cpp (modified) (16 diffs)
• tools/configure/environment.h (modified) (3 diffs)
• tools/configure/main.cpp (modified) (4 diffs)
• tools/configure/tools.cpp (modified) (8 diffs)
• tools/configure/tools.h (modified) (3 diffs)

trunk/tools/configure/configure.pro

@@ -4 +4 @@
 CONFIG   += console flat
 CONFIG   -= moc qt
-DEFINES  = QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_BUILD_QMAKE QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
+DEFINES  = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_BUILD_QMAKE QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
 
 
@@ -13 +13 @@
 win32-msvc* {
     QMAKE_CFLAGS_RELEASE -= -MD
+    QMAKE_CFLAGS_RELEASE += -MT
     QMAKE_CFLAGS_DEBUG -= -MDd
+    QMAKE_CFLAGS_DEBUG += -MTd
     QMAKE_CXXFLAGS_RELEASE -= -MD
+    QMAKE_CXXFLAGS_RELEASE += -MT
     QMAKE_CXXFLAGS_DEBUG -= -MDd
+    QMAKE_CXXFLAGS_DEBUG += -MTd
 }
 
@@ -33 +37 @@
            $$QT_SOURCE_TREE/src/corelib/tools/qlocale.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qvector.h \
+           $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec_p.h \
            $$QT_SOURCE_TREE/src/corelib/codecs/qtextcodec.h \
            $$QT_SOURCE_TREE/src/corelib/global/qglobal.h \
@@ -62 +67 @@
            $$QT_SOURCE_TREE/src/corelib/tools/qchar.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qhash.cpp \
-           $$QT_SOURCE_TREE/src/corelib/tools/qlistdata.cpp \
+           $$QT_SOURCE_TREE/src/corelib/tools/qlist.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qlocale.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qvector.cpp \
+           $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \
            $$QT_SOURCE_TREE/src/corelib/codecs/qtextcodec.cpp \
            $$QT_SOURCE_TREE/src/corelib/global/qglobal.cpp \

trunk/tools/configure/configure_pch.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/tools/configure/configureapp.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -117 +117 @@
 
     // Get the path to the executable
-    QFileInfo sourcePathInfo;
-    QT_WA({
-        unsigned short module_name[256];
-        GetModuleFileNameW(0, reinterpret_cast<wchar_t *>(module_name), sizeof(module_name));
-        sourcePathInfo = QString::fromUtf16(module_name);
-    }, {
-        char module_name[256];
-        GetModuleFileNameA(0, module_name, sizeof(module_name));
-        sourcePathInfo = QString::fromLocal8Bit(module_name);
-    });
+    wchar_t module_name[MAX_PATH];
+    GetModuleFileName(0, module_name, sizeof(module_name) / sizeof(wchar_t));
+    QFileInfo sourcePathInfo = QString::fromWCharArray(module_name);
     sourcePath = sourcePathInfo.absolutePath();
     sourceDir = sourcePathInfo.dir();
@@ -249 +242 @@
     dictionary[ "CETEST" ]          = "auto";
     dictionary[ "CE_SIGNATURE" ]    = "no";
-    dictionary[ "SCRIPTTOOLS" ]     = "yes";
+    dictionary[ "SCRIPT" ]          = "auto";
+    dictionary[ "SCRIPTTOOLS" ]     = "auto";
     dictionary[ "XMLPATTERNS" ]     = "auto";
     dictionary[ "PHONON" ]          = "auto";
     dictionary[ "PHONON_BACKEND" ]  = "yes";
+    dictionary[ "MULTIMEDIA" ]      = "yes";
+    dictionary[ "AUDIO_BACKEND" ]   = "yes";
     dictionary[ "DIRECTSHOW" ]      = "no";
     dictionary[ "WEBKIT" ]          = "auto";
+    dictionary[ "DECLARATIVE" ]     = "auto";
     dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
 
@@ -311 +308 @@
     dictionary[ "LIBPNG" ]          = "auto";
     dictionary[ "LIBMNG" ]          = "auto";
+    dictionary[ "FREETYPE" ]        = "no";
 
     dictionary[ "QT3SUPPORT" ]      = "yes";
     dictionary[ "ACCESSIBILITY" ]   = "yes";
     dictionary[ "OPENGL" ]          = "yes";
-    dictionary[ "DIRECT3D" ]        = "auto";
+    dictionary[ "OPENVG" ]          = "no";
     dictionary[ "IPV6" ]            = "yes"; // Always, dynamicly loaded
     dictionary[ "OPENSSL" ]         = "auto";
     dictionary[ "DBUS" ]            = "auto";
+    dictionary[ "S60" ]             = "yes";
 
     dictionary[ "STYLE_WINDOWS" ]   = "yes";
@@ -329 +328 @@
     dictionary[ "STYLE_MOTIF" ]     = "yes";
     dictionary[ "STYLE_CDE" ]       = "yes";
+    dictionary[ "STYLE_S60" ]       = "no";
     dictionary[ "STYLE_GTK" ]       = "no";
 
@@ -352 +352 @@
 
     dictionary[ "INCREDIBUILD_XGE" ] = "auto";
+    dictionary[ "LTCG" ]            = "no";
+    dictionary[ "NATIVE_GESTURES" ] = "yes";
 }
 
@@ -436 +438 @@
 
     for( ; i<configCmdLine.size(); ++i ) {
-        bool continueElse = false;
+        bool continueElse[] = {false, false};
         if( configCmdLine.at(i) == "-help"
             || configCmdLine.at(i) == "-h"
@@ -475 +477 @@
             dictionary[ "BUILDDEV" ] = "yes";
         else if( configCmdLine.at(i) == "-nokia-developer" ) {
+            cout << "Detected -nokia-developer option" << endl;
+            cout << "Nokia employees and agents are allowed to use this software under" << endl;
+            cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl;
             dictionary[ "BUILDNOKIA" ] = "yes";
             dictionary[ "BUILDDEV" ] = "yes";
@@ -484 +489 @@
         else if( configCmdLine.at(i) == "-commercial" ) {
             dictionary[ "BUILDTYPE" ] = "commercial";
+        }
+        else if( configCmdLine.at(i) == "-ltcg" ) {
+            dictionary[ "LTCG" ] = "yes";
+        }
+        else if( configCmdLine.at(i) == "-no-ltcg" ) {
+            dictionary[ "LTCG" ] = "no";
         }
 #endif
@@ -578 +589 @@
             dictionary[ "LIBMNG" ] = "system";
         }
+
+        // Text Rendering --------------------------------------------
+        else if( configCmdLine.at(i) == "-no-freetype" )
+            dictionary[ "FREETYPE" ] = "no";
+        else if( configCmdLine.at(i) == "-qt-freetype" )
+            dictionary[ "FREETYPE" ] = "yes";
+
         // CE- C runtime --------------------------------------------
         else if( configCmdLine.at(i) == "-crt" ) {
@@ -596 +614 @@
         else if (configCmdLine.at(i) == "-no-cetest") {
             dictionary[ "CETEST" ] = "no";
+            dictionary[ "CETEST_REQUESTED" ] = "no";
         } else if (configCmdLine.at(i) == "-cetest") {
             // although specified to use it, we stay at "auto" state
             // this is because checkAvailability() adds variables
-            // we need for crosscompilation
+            // we need for crosscompilation; but remember if we asked
+            // for it.
+            dictionary[ "CETEST_REQUESTED" ] = "yes";
         }
         // Qt/CE - signing tool -------------------------------------
@@ -657 +678 @@
             dictionary[ "STYLE_CDE" ] = "no";
 
+        else if( configCmdLine.at(i) == "-qt-style-s60" )
+            dictionary[ "STYLE_S60" ] = "yes";
+        else if( configCmdLine.at(i) == "-no-style-s60" )
+            dictionary[ "STYLE_S60" ] = "no";
+
         // Qt 3 Support ---------------------------------------------
         else if( configCmdLine.at(i) == "-no-qt3support" )
@@ -663 +689 @@
         // Work around compiler nesting limitation
         else
-            continueElse = true;
-        if (!continueElse) {
+            continueElse[1] = true;
+        if (!continueElse[1]) {
         }
 
@@ -676 +702 @@
             dictionary[ "OPENGL" ]          = "yes";
             dictionary[ "OPENGL_ES_CL" ]    = "yes";
-        }
+        } else if ( configCmdLine.at(i) == "-opengl-es-2" ) {
+            dictionary[ "OPENGL" ]          = "yes";
+            dictionary[ "OPENGL_ES_2" ]     = "yes";
+        }
+
+        // OpenVG Support -------------------------------------------
+        else if( configCmdLine.at(i) == "-openvg" ) {
+            dictionary[ "OPENVG" ]    = "yes";
+        } else if( configCmdLine.at(i) == "-no-openvg" ) {
+            dictionary[ "OPENVG" ]    = "no";
+        }
+
         // Databases ------------------------------------------------
         else if( configCmdLine.at(i) == "-qt-sql-mysql" )
@@ -762 +799 @@
         else if( configCmdLine.at(i) == "-incredibuild-xge" )
             dictionary[ "INCREDIBUILD_XGE" ] = "yes";
+        else if( configCmdLine.at(i) == "-native-gestures" )
+            dictionary[ "NATIVE_GESTURES" ] = "yes";
+        else if( configCmdLine.at(i) == "-no-native-gestures" )
+            dictionary[ "NATIVE_GESTURES" ] = "no";
 #if !defined(EVAL)
         // Others ---------------------------------------------------
+        else if (configCmdLine.at(i) == "-fpu" )
+        {
+            ++i;
+            if(i==argCount)
+                break;
+            dictionary[ "ARM_FPU_TYPE" ] = configCmdLine.at(i);
+        }
+
+        // S60 Support -------------------------------------------
+        else if( configCmdLine.at(i) == "-s60" )
+            dictionary[ "S60" ]    = "yes";
+        else if( configCmdLine.at(i) == "-no-s60" )
+            dictionary[ "S60" ]    = "no";
+
         else if (configCmdLine.at(i) == "-fast" )
             dictionary[ "FAST" ] = "yes";
@@ -812 +867 @@
             dictionary[ "IWMMXT" ] = "yes";
 
-        else if (configCmdLine.at(i) == "-no-direct3d") {
-            dictionary["DIRECT3D"] = "no";
-        }else if (configCmdLine.at(i) == "-direct3d") {
-            dictionary["DIRECT3D"] = "auto"; // have to pass auto detection to enable Direct3D
-        } else if( configCmdLine.at(i) == "-no-openssl" ) {
+        else if( configCmdLine.at(i) == "-no-openssl" ) {
               dictionary[ "OPENSSL"] = "no";
         } else if( configCmdLine.at(i) == "-openssl" ) {
@@ -832 +883 @@
         } else if( configCmdLine.at(i) == "-dbus-linked" ) {
             dictionary[ "DBUS" ] = "linked";
+        } else if( configCmdLine.at(i) == "-no-script" ) {
+            dictionary[ "SCRIPT" ] = "no";
+        } else if( configCmdLine.at(i) == "-script" ) {
+            dictionary[ "SCRIPT" ] = "yes";
         } else if( configCmdLine.at(i) == "-no-scripttools" ) {
             dictionary[ "SCRIPTTOOLS" ] = "no";
@@ -840 +895 @@
         } else if( configCmdLine.at(i) == "-xmlpatterns" ) {
             dictionary[ "XMLPATTERNS" ] = "yes";
+        } else if( configCmdLine.at(i) == "-no-multimedia" ) {
+            dictionary[ "MULTIMEDIA" ] = "no";
+        } else if( configCmdLine.at(i) == "-multimedia" ) {
+            dictionary[ "MULTIMEDIA" ] = "yes";
+        } else if( configCmdLine.at(i) == "-audio-backend" ) {
+            dictionary[ "AUDIO_BACKEND" ] = "yes";
+        } else if( configCmdLine.at(i) == "-no-audio-backend" ) {
+            dictionary[ "AUDIO_BACKEND" ] = "no";
         } else if( configCmdLine.at(i) == "-no-phonon" ) {
             dictionary[ "PHONON" ] = "no";
@@ -854 +917 @@
         } else if( configCmdLine.at(i) == "-webkit" ) {
             dictionary[ "WEBKIT" ] = "yes";
+        } else if( configCmdLine.at(i) == "-no-declarative" ) {
+            dictionary[ "DECLARATIVE" ] = "no";
+        } else if( configCmdLine.at(i) == "-declarative" ) {
+            dictionary[ "DECLARATIVE" ] = "yes";
         } else if( configCmdLine.at(i) == "-no-plugin-manifests" ) {
             dictionary[ "PLUGIN_MANIFESTS" ] = "no";
         } else if( configCmdLine.at(i) == "-plugin-manifests" ) {
             dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
+        }
+
+        // Work around compiler nesting limitation
+        else
+            continueElse[0] = true;
+        if (!continueElse[0]) {
         }
 
@@ -884 +957 @@
                 break;
             qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i);
+        } else if( configCmdLine.at(i) == "-qtlibinfix" ) {
+            ++i;
+            if(i==argCount)
+                break;
+            dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i);
         } else if( configCmdLine.at(i) == "-D" ) {
             ++i;
@@ -1029 +1107 @@
                 break;
             QString system = configCmdLine.at(i);
-            if (system == QLatin1String("raster") || system == QLatin1String("opengl"))
+            if (system == QLatin1String("raster")
+                || system == QLatin1String("opengl")
+                || system == QLatin1String("openvg"))
                 dictionary["GRAPHICS_SYSTEM"] = configCmdLine.at(i);
         }
@@ -1096 +1176 @@
     }
 
+    // Tell the user how to proceed building Qt after configure finished its job
+    dictionary["QTBUILDINSTRUCTION"] = dictionary["MAKE"];
+    if (dictionary.contains("XQMAKESPEC")) {
+        if (dictionary["XQMAKESPEC"].startsWith("symbian")) {
+            dictionary["QTBUILDINSTRUCTION"] = QString("make debug-winscw|debug-armv5|release-armv5");
+        } else if (dictionary["XQMAKESPEC"].startsWith("wince")) {
+            dictionary["QTBUILDINSTRUCTION"] =
+                QString("setcepaths.bat ") + dictionary["XQMAKESPEC"] + QString(" && ") + dictionary["MAKE"];
+        }
+    }
+
+    // Tell the user how to confclean before the next configure
+    dictionary["CONFCLEANINSTRUCTION"] = dictionary["MAKE"] + QString(" confclean");
+
     // Ensure that -spec (XQMAKESPEC) exists in the mkspecs folder as well
     if (dictionary.contains("XQMAKESPEC") &&
@@ -1127 +1221 @@
     useUnixSeparators = (dictionary["QMAKESPEC"] == "win32-g++");
 
+    // Allow tests for private classes to be compiled against internal builds
+    if (dictionary["BUILDDEV"] == "yes")
+        qtConfig += "private_tests";
+
 
 #if !defined(EVAL)
@@ -1149 +1247 @@
 void Configure::validateArgs()
 {
-    QStringList configs;
     // Validate the specified config
 
+    // Get all possible configurations from the file system.
     QDir dir;
     QStringList filters;
@@ -1165 +1263 @@
     allConfigs << "full";
 
+    // Try internal configurations first.
+    QStringList possible_configs = QStringList()
+        << "minimal"
+        << "small"
+        << "medium"
+        << "large"
+        << "full";
+    int index = possible_configs.indexOf(dictionary["QCONFIG"]);
+    if (index >= 0) {
+        for (int c = 0; c <= index; c++) {
+            qmakeConfig += possible_configs[c] + "-config";
+        }
+        return;
+    }
+
+    // If the internal configurations failed, try others.
     QStringList::Iterator config;
     for( config = allConfigs.begin(); config != allConfigs.end(); ++config ) {
-        configs += (*config) + "-config";
         if( (*config) == dictionary[ "QCONFIG" ] )
             break;
@@ -1176 +1289 @@
     }
     else
-        qmakeConfig += configs;
+        qmakeConfig += (*config) + "-config";
 }
 #endif
@@ -1297 +1410 @@
         dictionary[ "STYLE_MOTIF" ]         = "no";
         dictionary[ "STYLE_CDE" ]           = "no";
+        dictionary[ "STYLE_S60" ]           = "no";
+        dictionary[ "FREETYPE" ]            = "no";
         dictionary[ "QT3SUPPORT" ]          = "no";
         dictionary[ "OPENGL" ]              = "no";
@@ -1310 +1425 @@
         dictionary[ "IWMMXT" ]              = "no";
         dictionary[ "CE_CRT" ]              = "yes";
-        dictionary[ "DIRECT3D" ]            = "no";
         dictionary[ "WEBKIT" ]              = "no";
         dictionary[ "PHONON" ]              = "yes";
@@ -1322 +1436 @@
         dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
         dictionary[ "QT_INSTALL_PREFIX" ]   = "";
+
+    } else if(dictionary[ "XQMAKESPEC" ].startsWith("symbian")) {
+        dictionary[ "ACCESSIBILITY" ]       = "no";
+        dictionary[ "STYLE_WINDOWSXP" ]     = "no";
+        dictionary[ "STYLE_WINDOWSVISTA" ]  = "no";
+        dictionary[ "STYLE_PLASTIQUE" ]     = "no";
+        dictionary[ "STYLE_CLEANLOOKS" ]    = "no";
+        dictionary[ "STYLE_WINDOWSCE" ]     = "no";
+        dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
+        dictionary[ "STYLE_MOTIF" ]         = "no";
+        dictionary[ "STYLE_CDE" ]           = "no";
+        dictionary[ "STYLE_S60" ]           = "yes";
+        dictionary[ "FREETYPE" ]            = "no";
+        dictionary[ "QT3SUPPORT" ]          = "no";
+        dictionary[ "OPENGL" ]              = "no";
+        dictionary[ "OPENSSL" ]             = "yes";
+        dictionary[ "STL" ]                 = "yes";
+        dictionary[ "EXCEPTIONS" ]          = "yes";
+        dictionary[ "RTTI" ]                = "yes";
+        dictionary[ "ARCHITECTURE" ]        = "symbian";
+        dictionary[ "3DNOW" ]               = "no";
+        dictionary[ "SSE" ]                 = "no";
+        dictionary[ "SSE2" ]                = "no";
+        dictionary[ "MMX" ]                 = "no";
+        dictionary[ "IWMMXT" ]              = "no";
+        dictionary[ "CE_CRT" ]              = "no";
+        dictionary[ "DIRECT3D" ]            = "no";
+        dictionary[ "WEBKIT" ]              = "yes";
+        dictionary[ "ASSISTANT_WEBKIT" ]    = "no";
+        dictionary[ "PHONON" ]              = "yes";
+        dictionary[ "XMLPATTERNS" ]         = "yes";
+        dictionary[ "QT_GLIB" ]             = "no";
+        dictionary[ "S60" ]                 = "yes";
+        // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested)
+        // iconv_open seems to return -1 always, so something is probably missing from the platform.
+        dictionary[ "QT_ICONV" ]            = "no";
+        dictionary[ "SCRIPTTOOLS" ]         = "no";
+        dictionary[ "QT_HOST_PREFIX" ]      = dictionary[ "QT_INSTALL_PREFIX" ];
+        dictionary[ "QT_INSTALL_PREFIX" ]   = "";
+        dictionary[ "QT_INSTALL_PLUGINS" ]  = "\\resource\\qt\\plugins";
+        dictionary[ "ARM_FPU_TYPE" ]        = "softvfp";
+        dictionary[ "SQL_SQLITE" ]          = "yes";
+        dictionary[ "SQL_SQLITE_LIB" ]      = "system";
+
+        // Disable building docs and translations for now
+        disabledBuildParts << "docs" << "translations";
 
     } else if(dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong.
@@ -1409 +1569 @@
                     "[-no-libmng] [-qt-libmng] [-system-libmng] [-no-qt3support] [-mmx]\n"
                     "[-no-mmx] [-3dnow] [-no-3dnow] [-sse] [-no-sse] [-sse2] [-no-sse2]\n"
-                    "[-no-iwmmxt] [-iwmmxt] [-direct3d] [-openssl] [-openssl-linked]\n"
+                    "[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n"
                     "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
-                    "[-qtnamespace <namespace>] [-no-phonon] [-phonon]\n"
-                    "[-no-phonon-backend] [-phonon-backend]\n"
-                    "[-no-webkit] [-webkit]\n"
-                    "[-no-scripttools] [-scripttools]\n"
-                    "[-graphicssystem raster|opengl]\n\n", 0, 7);
+                    "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
+                    "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
+                    "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
+                    "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
+                    "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
 
         desc("Installation options:\n\n");
@@ -1459 +1619 @@
         desc("SHARED", "yes",   "-shared",              "Create and use shared Qt libraries.");
         desc("SHARED", "no",    "-static",              "Create and use static Qt libraries.\n");
+
+        desc("LTCG", "yes",   "-ltcg",                  "Use Link Time Code Generation. (Release builds only)");
+        desc("LTCG", "no",    "-no-ltcg",               "Do not use Link Time Code Generation.\n");
 
         desc("FAST", "no",      "-no-fast",             "Configure Qt normally by generating Makefiles for all project files.");
@@ -1494 +1657 @@
         desc("OPENGL", "no","-no-opengl",               "Disables OpenGL functionality\n");
 
+        desc("OPENVG", "no","-no-openvg",               "Disables OpenVG functionality\n");
+        desc("OPENVG", "yes","-openvg",                 "Enables OpenVG functionality");
+        desc(                   "",                     "Requires EGL support, typically supplied by an OpenGL", false, ' ');
+        desc(                   "",                     "or other graphics implementation\n", false, ' ');
+
 #endif
         desc(                   "-platform <spec>",     "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n");
@@ -1500 +1668 @@
 
 #if !defined(EVAL)
-        desc(                   "-qtnamespace <namespace>", "Wraps all Qt library code in 'namespace name {...}\n");
+        desc(                   "-qtnamespace <namespace>", "Wraps all Qt library code in 'namespace name {...}");
+        desc(                   "-qtlibinfix <infix>",  "Renames all Qt* libs to Qt*<infix>\n");
         desc(                   "-D <define>",          "Add an explicit define to the preprocessor.");
         desc(                   "-I <includepath>",     "Add an explicit include path.");
@@ -1509 +1678 @@
                                 "Available values for <sys>:");
         desc("GRAPHICS_SYSTEM", "raster", "", "  raster - Software rasterizer", ' ');
-        desc("GRAPHICS_SYSTEM", "opengl", "", "  opengl - Using OpenGL accelleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "opengl", "", "  opengl - Using OpenGL acceleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "openvg", "", "  openvg - Using OpenVG acceleration, experimental!", ' ');
 
 
@@ -1573 +1743 @@
         desc("SSE2", "no",      "-no-sse2",             "Do not compile with use of SSE2 instructions");
         desc("SSE2", "yes",      "-sse2",               "Compile with use of SSE2 instructions");
-        desc("DIRECT3D", "yes",  "-direct3d",           "Compile in Direct3D support (experimental - see INSTALL for more info)");
         desc("OPENSSL", "no",    "-no-openssl",         "Do not compile in OpenSSL support");
         desc("OPENSSL", "yes",   "-openssl",            "Compile in run-time OpenSSL support");
@@ -1584 +1753 @@
         desc("PHONON_BACKEND","no", "-no-phonon-backend","Do not compile the platform-specific Phonon backend-plugin");
         desc("PHONON_BACKEND","yes","-phonon-backend",  "Compile in the platform-specific Phonon backend-plugin");
+        desc("MULTIMEDIA", "no", "-no-multimedia",      "Do not compile the multimedia module");
+        desc("MULTIMEDIA", "yes","-multimedia",         "Compile in multimedia module");
+        desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia");
+        desc("AUDIO_BACKEND", "yes","-audio-backend",   "Compile in the platform audio backend into QtMultimedia");
         desc("WEBKIT", "no",    "-no-webkit",           "Do not compile in the WebKit module");
         desc("WEBKIT", "yes",   "-webkit",              "Compile in the WebKit module (WebKit is built if a decent C++ compiler is used.)");
+        desc("SCRIPT", "no",    "-no-script",           "Do not build the QtScript module.");
+        desc("SCRIPT", "yes",   "-script",              "Build the QtScript module.");
         desc("SCRIPTTOOLS", "no", "-no-scripttools",    "Do not build the QtScriptTools module.");
         desc("SCRIPTTOOLS", "yes", "-scripttools",      "Build the QtScriptTools module.");
+        desc("DECLARATIVE", "no",    "-no-declarative", "Do not build the declarative module");
+        desc("DECLARATIVE", "yes",   "-declarative",    "Build the declarative module");
 
         desc(                   "-arch <arch>",         "Specify an architecture.\n"
@@ -1593 +1770 @@
         desc("ARCHITECTURE","windows",       "",        "  windows", ' ');
         desc("ARCHITECTURE","windowsce",     "",        "  windowsce", ' ');
+        desc("ARCHITECTURE","symbian",     "",          "  symbian", ' ');
         desc("ARCHITECTURE","boundschecker",     "",    "  boundschecker", ' ');
         desc("ARCHITECTURE","generic", "",              "  generic\n", ' ');
@@ -1607 +1785 @@
         desc("STYLE_CDE", "yes", "",                    "  cde", ' ');
         desc("STYLE_WINDOWSCE", "yes", "",              "  windowsce", ' ');
-        desc("STYLE_WINDOWSMOBILE" , "yes", "",         "  windowsmobile\n", ' ');
+        desc("STYLE_WINDOWSMOBILE" , "yes", "",         "  windowsmobile", ' ');
+        desc("STYLE_S60" , "yes", "",                   "  s60\n", ' ');
+        desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7.");
+        desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.");
 
 /*      We do not support -qconfig on Windows yet
@@ -1633 +1814 @@
         desc("OPENGL_ES_CM", "no", "-opengl-es-cm",        "Enable support for OpenGL ES Common");
         desc("OPENGL_ES_CL", "no", "-opengl-es-cl",        "Enable support for OpenGL ES Common Lite");
+        desc("OPENGL_ES_2",  "no", "-opengl-es-2",         "Enable support for OpenGL ES 2.0");
         desc("DIRECTSHOW", "no",   "-phonon-wince-ds9",    "Enable Phonon Direct Show 9 backend for Windows CE");
 
+        // Qt\Symbian only options go below here -----------------------------------------------------------------------------
+        desc("Qt for Symbian OS only:\n\n");
+        desc("FREETYPE", "no",     "-no-freetype",         "Do not compile in Freetype2 support.");
+        desc("FREETYPE", "yes",    "-qt-freetype",         "Use the libfreetype bundled with Qt.");
+        desc(                      "-fpu <flags>",         "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2");
+        desc("S60", "no",          "-no-s60",              "Do not compile in S60 support.");
+        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework\n");
         return true;
     }
@@ -1640 +1829 @@
 }
 
-bool Configure::findFileInPaths(const QString &fileName, const QStringList &paths)
-{
-    QDir d;
-    for( QStringList::ConstIterator it = paths.begin(); it != paths.end(); ++it ) {
-        // Remove any leading or trailing ", this is commonly used in the environment
-        // variables
-        QString path = (*it);
-        if ( path.startsWith( "\"" ) )
-            path = path.right( path.length() - 1 );
-        if ( path.endsWith( "\"" ) )
-            path = path.left( path.length() - 1 );
-        if( d.exists( path + QDir::separator() + fileName ) )
-            return true;
-    }
-    return false;
-}
-
-bool Configure::findFile( const QString &fileName )
-{
-    QString file = fileName.toLower();
-    QStringList paths;
+QString Configure::findFileInPaths(const QString &fileName, const QString &paths)
+{
 #if defined(Q_OS_WIN32)
     QRegExp splitReg("[;,]");
@@ -1666 +1836 @@
     QRegExp splitReg("[:]");
 #endif
-    if (file.endsWith(".h"))
-        paths = QString::fromLocal8Bit(getenv("INCLUDE")).split(splitReg, QString::SkipEmptyParts);
-    else if ( file.endsWith( ".lib" ) )
-        paths = QString::fromLocal8Bit(getenv("LIB")).split(splitReg, QString::SkipEmptyParts);
-    else
-        paths = QString::fromLocal8Bit(getenv("PATH")).split(splitReg, QString::SkipEmptyParts);
-    return findFileInPaths(file, paths);
+    QStringList pathList = paths.split(splitReg, QString::SkipEmptyParts);
+    QDir d;
+    for( QStringList::ConstIterator it = pathList.begin(); it != pathList.end(); ++it ) {
+        // Remove any leading or trailing ", this is commonly used in the environment
+        // variables
+        QString path = (*it);
+        if ( path.startsWith( '\"' ) )
+            path = path.right( path.length() - 1 );
+        if ( path.endsWith( '\"' ) )
+            path = path.left( path.length() - 1 );
+        if( d.exists( path + QDir::separator() + fileName ) )
+            return path;
+    }
+    return QString();
+}
+
+bool Configure::findFile( const QString &fileName )
+{
+    const QString file = fileName.toLower();
+    const QString pathEnvVar = QString::fromLocal8Bit(getenv("PATH"));
+    const QString mingwPath = dictionary["QMAKESPEC"].endsWith("-g++") ?
+        findFileInPaths("mingw32-g++.exe", pathEnvVar) : QString();
+
+    QString paths;
+    if (file.endsWith(".h")) {
+        if (!mingwPath.isNull() && !findFileInPaths(file, mingwPath + QLatin1String("/../include")).isNull())
+                    return true;
+        paths = QString::fromLocal8Bit(getenv("INCLUDE"));
+    } else if ( file.endsWith( ".lib" ) ||  file.endsWith( ".a" ) ) {
+        if (!mingwPath.isNull() && !findFileInPaths(file, mingwPath + QLatin1String("/../lib")).isNull())
+                    return true;
+        paths = QString::fromLocal8Bit(getenv("LIB"));
+    } else {
+        paths = pathEnvVar;
+    }
+    return !findFileInPaths(file, paths).isNull();
 }
 
@@ -1742 +1941 @@
     bool available = false;
     if (part == "STYLE_WINDOWSXP")
-        available = (dictionary.value("QMAKESPEC") == "win32-g++" || findFile("uxtheme.h"));
+        available = (findFile("uxtheme.h"));
 
     else if (part == "ZLIB")
@@ -1768 +1967 @@
         available = findFile("sqlcli.h") && findFile("sqlcli1.h") && findFile("db2cli.lib");
     else if (part == "SQL_SQLITE")
+        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian"))
+            available = false; // In Symbian we only support system sqlite option
+        else
             available = true; // Built in, we have a fork
     else if (part == "SQL_SQLITE_LIB") {
         if (dictionary[ "SQL_SQLITE_LIB" ] == "system") {
-            available = findFile("sqlite3.h") && findFile("sqlite3.lib");
-            if (available)
-                dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib";
+                    // Symbian has multiple .lib/.dll files we need to find
+            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+                            available = true; // There is sqlite_symbian plugin which exports the necessary stuff
+                            dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3";
+                    } else {
+                            available = findFile("sqlite3.h") && findFile("sqlite3.lib");
+                            if (available)
+                                    dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib";
+                    }
         } else
             available = true;
@@ -1785 +1993 @@
         available = (dictionary[ "ARCHITECTURE" ]  == "windowsce");
     else if (part == "OPENGL_ES_CL")
+        available = (dictionary[ "ARCHITECTURE" ]  == "windowsce");
+    else if (part == "OPENGL_ES_2")
         available = (dictionary[ "ARCHITECTURE" ]  == "windowsce");
     else if (part == "DIRECTSHOW")
@@ -1806 +2016 @@
             dictionary[ "QT_CE_RAPI_LIB" ] += QLatin1String("\"") + rapiLib + QLatin1String("\"");
         }
+        else if (dictionary[ "CETEST_REQUESTED" ] == "yes") {
+            cout << "cetest could not be enabled: rapi.h and rapi.lib could not be found." << endl;
+            cout << "Make sure the environment is set up for compiling with ActiveSync." << endl;
+            dictionary[ "DONE" ] = "error";
+        }
     }
     else if (part == "INCREDIBUILD_XGE")
@@ -1816 +2031 @@
                && dictionary.value("QMAKESPEC") != "win32-msvc2002"
                && dictionary.value("EXCEPTIONS") == "yes";
-    } else if (part == "DIRECT3D") {
-        QString sdk_dir(QString::fromLocal8Bit(getenv("DXSDK_DIR")));
-        QDir dir;
-        bool has_d3d = false;
-
-        if (!sdk_dir.isEmpty() && dir.exists(sdk_dir))
-            has_d3d = true;
-
-        if (has_d3d && !QFile::exists(sdk_dir + QLatin1String("\\include\\d3d9.h"))) {
-            cout << "No Direct3D version 9 SDK found." << endl;
-           has_d3d = false;
-        }
-
-        // find the first dxguid.lib in the current LIB paths, if it is NOT
-        // the D3D SDK one, we're most likely in trouble..
-        if (has_d3d) {
-            has_d3d = false;
-            QString env_lib(QString::fromLocal8Bit(getenv("LIB")));
-            QStringList lib_paths = env_lib.split(';');
-            for (int i=0; i<lib_paths.size(); ++i) {
-               QString lib_path = lib_paths.at(i);
-                if (QFile::exists(lib_path + QLatin1String("\\dxguid.lib")))
-                {
-                    if (lib_path.startsWith(sdk_dir)) {
-                        has_d3d = true;
-                    } else {
-                        cout << "Your D3D/Platform SDK library paths seem to appear in the wrong order." << endl;
-                    }
-                    break;
-                }
-            }
-        }
-
-        available = has_d3d;
-        if (!has_d3d) {
-            cout << "Setting Direct3D to NO, since the proper Direct3D SDK was not detected." << endl
-                 << "Make sure you have the Direct3D SDK installed, and that you have run" << endl
-                 << "the <path to SDK>\\Utilities\\Bin\\dx_setenv.cmd script." << endl
-                 << "The D3D SDK library path *needs* to appear before the Platform SDK library" << endl
-                 << "path in your LIB environment variable." << endl;
-        }
     } else if (part == "PHONON") {
-        available = findFile("vmr9.h") && findFile("dshow.h") && findFile("strmiids.lib") &&
-                        findFile("dmoguids.lib") && findFile("msdmo.lib") && findFile("d3d9.h");
+        available = findFile("vmr9.h") && findFile("dshow.h") && findFile("dmo.h") && findFile("dmodshow.h")
+            && (findFile("strmiids.lib") || findFile("libstrmiids.a"))
+            && (findFile("dmoguids.lib") || findFile("libdmoguids.a"))
+            && (findFile("msdmo.lib") || findFile("libmsdmo.a"))
+            && findFile("d3d9.h");
 
         if (!available) {
             cout << "All the required DirectShow/Direct3D files couldn't be found." << endl
-                 << "Make sure you have either the platform SDK AND the DirectX SDK or the Windows SDK installed." << endl
-                 << "If you have the DirectX SDK installed, please make sure that you have run the <path to SDK>\\SetEnv.Cmd script." << endl;
-        }
+                 << "Make sure you have either the platform SDK AND the DirectShow SDK or the Windows SDK installed." << endl
+                 << "If you have the DirectShow SDK installed, please make sure that you have run the <path to SDK>\\SetEnv.Cmd script." << endl;
+            if (!findFile("vmr9.h"))  cout << "vmr9.h not found" << endl;
+            if (!findFile("dshow.h")) cout << "dshow.h not found" << endl;
+            if (!findFile("strmiids.lib")) cout << "strmiids.lib not found" << endl;
+            if (!findFile("dmoguids.lib")) cout << "dmoguids.lib not found" << endl;
+            if (!findFile("msdmo.lib")) cout << "msdmo.lib not found" << endl;
+            if (!findFile("d3d9.h")) cout << "d3d9.h not found" << endl;
+        }
+    } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS") {
+        available = true;
     } else if (part == "WEBKIT") {
         available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++");
-    } else if (part == "SCRIPTTOOLS") {
-        available = true;
+    } else if (part == "DECLARATIVE") {
+        available = QFile::exists(sourcePath + "/src/declarative/qml/qmlcomponent.h");
     }
 
@@ -1946 +2131 @@
     if (dictionary["DBUS"] == "auto")
         dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no";
+    if (dictionary["SCRIPT"] == "auto")
+        dictionary["SCRIPT"] = checkAvailability("SCRIPT") ? "yes" : "no";
     if (dictionary["SCRIPTTOOLS"] == "auto")
         dictionary["SCRIPTTOOLS"] = checkAvailability("SCRIPTTOOLS") ? "yes" : "no";
     if (dictionary["XMLPATTERNS"] == "auto")
         dictionary["XMLPATTERNS"] = checkAvailability("XMLPATTERNS") ? "yes" : "no";
-    if (dictionary["DIRECT3D"] == "auto")
-        dictionary["DIRECT3D"] = checkAvailability("DIRECT3D") ? "yes" : "no";
     if (dictionary["PHONON"] == "auto")
         dictionary["PHONON"] = checkAvailability("PHONON") ? "yes" : "no";
     if (dictionary["WEBKIT"] == "auto")
         dictionary["WEBKIT"] = checkAvailability("WEBKIT") ? "yes" : "no";
+    if (dictionary["DECLARATIVE"] == "auto")
+        dictionary["DECLARATIVE"] = checkAvailability("DECLARATIVE") ? "yes" : "no";
 
     // Qt/WinCE remote test application
@@ -1999 +2186 @@
             exit(0);      // Exit cleanly for Ctrl+C
     }
+        if (0 != dictionary["ARM_FPU_TYPE"].size())
+        {
+                QStringList l= QStringList()
+                        << "softvfp"
+                        << "softvfp+vfpv2"
+                        << "vfpv2";
+                if (!(l.contains(dictionary["ARM_FPU_TYPE"])))
+                        cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl;
+        }
 
     return true;
@@ -2021 +2217 @@
      dll staticlib
 
-     internal
      nocrosscompiler
      GNUmake
@@ -2047 +2242 @@
     if (!dictionary["QCONFIG"].isEmpty())
         build_options += dictionary["QCONFIG"] + "-config ";
-    if (dictionary["STL"] == "no")
-        build_options += "no-stl";
     build_options.sort();
 
@@ -2148 +2341 @@
         qtConfig += "system-mng";
 
+    // Text rendering --------------------------------------------------
+    if( dictionary[ "FREETYPE" ] == "yes" )
+        qtConfig += "freetype";
+
     // Styles -------------------------------------------------------
     if ( dictionary[ "STYLE_WINDOWS" ] == "yes" )
@@ -2178 +2375 @@
     if ( dictionary[ "STYLE_CDE" ] == "yes" )
         qmakeStyles += "cde";
+
+    if ( dictionary[ "STYLE_S60" ] == "yes" )
+        qmakeStyles += "s60";
 
     // Databases ----------------------------------------------------
@@ -2263 +2463 @@
     if ( dictionary["OPENGL_ES_CM"] == "yes" ) {
         qtConfig += "opengles1";
+        qtConfig += "egl";
+    }
+
+    if ( dictionary["OPENGL_ES_2"] == "yes" ) {
+        qtConfig += "opengles2";
+        qtConfig += "egl";
     }
 
     if ( dictionary["OPENGL_ES_CL"] == "yes" ) {
         qtConfig += "opengles1cl";
+        qtConfig += "egl";
+    }
+
+    if ( dictionary["OPENVG"] == "yes" ) {
+        qtConfig += "openvg";
+        qtConfig += "egl";
+    }
+
+    if ( dictionary["S60"] == "yes" ) {
+        qtConfig += "s60";
     }
 
      if ( dictionary["DIRECTSHOW"] == "yes" )
         qtConfig += "directshow";
-
-    if (dictionary[ "DIRECT3D" ] == "yes")
-        qtConfig += "direct3d";
 
     if (dictionary[ "OPENSSL" ] == "yes")
@@ -2293 +2506 @@
         qtConfig += "cetest";
 
-    if (dictionary[ "SCRIPTTOOLS" ] == "yes")
+    if (dictionary[ "SCRIPT" ] == "yes")
+        qtConfig += "script";
+
+    if (dictionary[ "SCRIPTTOOLS" ] == "yes") {
+        if (dictionary[ "SCRIPT" ] == "no") {
+            cout << "QtScriptTools was requested, but it can't be built due to QtScript being "
+                    "disabled." << endl;
+            dictionary[ "DONE" ] = "error";
+        }
         qtConfig += "scripttools";
+    }
 
     if (dictionary[ "XMLPATTERNS" ] == "yes")
@@ -2305 +2527 @@
     }
 
+    if (dictionary["MULTIMEDIA"] == "yes")
+        qtConfig += "multimedia";
+
     if (dictionary["WEBKIT"] == "yes")
         qtConfig += "webkit";
+
+    if (dictionary["DECLARATIVE"] == "yes")
+        qtConfig += "declarative";
+
+    if( dictionary[ "NATIVE_GESTURES" ] == "yes" )
+        qtConfig += "native-gestures";
 
     // We currently have no switch for QtSvg, so add it unconditionally.
@@ -2327 +2558 @@
         }
     }
+
+    if (dictionary.contains("XQMAKESPEC") && ( dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"] ) )
+            qmakeConfig += "cross_compile";
 
     // Directories and settings for .qmake.cache --------------------
@@ -2368 +2602 @@
     if (!opensslLibs.isEmpty())
         qmakeVars += opensslLibs;
-    else if (dictionary[ "OPENSSL" ] == "linked")
-        qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
+    else if (dictionary[ "OPENSSL" ] == "linked") {
+        if(dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("symbian") )
+            qmakeVars += QString("OPENSSL_LIBS    = -llibssl -llibcrypto");
+        else
+            qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
+        }
     if (!qmakeSql.isEmpty())
         qmakeVars += QString("sql-drivers    += ") + qmakeSql.join( " " );
@@ -2482 +2720 @@
             configStream << " static";
 
+        if( dictionary[ "LTCG" ] == "yes" )
+            configStream << " ltcg";
         if( dictionary[ "STL" ] == "yes" )
             configStream << " stl";
@@ -2526 +2766 @@
 
         if(!dictionary["QMAKE_RPATHDIR"].isEmpty())
-            configStream<<"QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"];
+            configStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl;
+
+        if (!dictionary["QT_LIBINFIX"].isEmpty())
+            configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
+
+        if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
+            configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
+        }
 
         configStream.flush();
@@ -2636 +2883 @@
         if(dictionary["STYLE_MOTIF"] != "yes")       qconfigList += "QT_NO_STYLE_MOTIF";
         if(dictionary["STYLE_CDE"] != "yes")         qconfigList += "QT_NO_STYLE_CDE";
+        if(dictionary["STYLE_S60"] != "yes")         qconfigList += "QT_NO_STYLE_S60";
         if(dictionary["STYLE_WINDOWSCE"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSCE";
         if(dictionary["STYLE_WINDOWSMOBILE"] != "yes")   qconfigList += "QT_NO_STYLE_WINDOWSMOBILE";
@@ -2650 +2898 @@
         }
 
-        if(dictionary["QT3SUPPORT"] == "no")        qconfigList += "QT_NO_QT3SUPPORT";
         if(dictionary["ACCESSIBILITY"] == "no")     qconfigList += "QT_NO_ACCESSIBILITY";
         if(dictionary["EXCEPTIONS"] == "no")        qconfigList += "QT_NO_EXCEPTIONS";
         if(dictionary["OPENGL"] == "no")            qconfigList += "QT_NO_OPENGL";
-        if(dictionary["DIRECT3D"] == "no")          qconfigList += "QT_NO_DIRECT3D";
+        if(dictionary["OPENVG"] == "no")            qconfigList += "QT_NO_OPENVG";
         if(dictionary["OPENSSL"] == "no")           qconfigList += "QT_NO_OPENSSL";
         if(dictionary["OPENSSL"] == "linked")       qconfigList += "QT_LINKED_OPENSSL";
@@ -2660 +2907 @@
         if(dictionary["IPV6"] == "no")              qconfigList += "QT_NO_IPV6";
         if(dictionary["WEBKIT"] == "no")            qconfigList += "QT_NO_WEBKIT";
+        if(dictionary["DECLARATIVE"] == "no")       qconfigList += "QT_NO_DECLARATIVE";
         if(dictionary["PHONON"] == "no")            qconfigList += "QT_NO_PHONON";
+        if(dictionary["MULTIMEDIA"] == "no")        qconfigList += "QT_NO_MULTIMEDIA";
         if(dictionary["XMLPATTERNS"] == "no")       qconfigList += "QT_NO_XMLPATTERNS";
+        if(dictionary["SCRIPT"] == "no")            qconfigList += "QT_NO_SCRIPT";
         if(dictionary["SCRIPTTOOLS"] == "no")       qconfigList += "QT_NO_SCRIPTTOOLS";
+        if(dictionary["FREETYPE"] == "no")          qconfigList += "QT_NO_FREETYPE";
+        if(dictionary["S60"] == "no")               qconfigList += "QT_NO_S60";
+        if(dictionary["NATIVE_GESTURES"] == "no")   qconfigList += "QT_NO_NATIVE_GESTURES";
 
         if(dictionary["OPENGL_ES_CM"] == "yes" ||
-           dictionary["OPENGL_ES_CL"] == "yes")     qconfigList += "QT_OPENGL_ES";
+           dictionary["OPENGL_ES_CL"] == "yes" ||
+           dictionary["OPENGL_ES_2"]  == "yes")     qconfigList += "QT_OPENGL_ES";
 
         if(dictionary["OPENGL_ES_CM"] == "yes")     qconfigList += "QT_OPENGL_ES_1";
+        if(dictionary["OPENGL_ES_2"]  == "yes")     qconfigList += "QT_OPENGL_ES_2";
         if(dictionary["OPENGL_ES_CL"] == "yes")     qconfigList += "QT_OPENGL_ES_1_CL";
 
@@ -2680 +2935 @@
         if(dictionary["SQL_IBASE"] == "yes")        qconfigList += "QT_SQL_IBASE";
 
+        if (dictionary["GRAPHICS_SYSTEM"] == "openvg") qconfigList += "QT_GRAPHICSSYSTEM_OPENVG";
         if (dictionary["GRAPHICS_SYSTEM"] == "opengl") qconfigList += "QT_GRAPHICSSYSTEM_OPENGL";
         if (dictionary["GRAPHICS_SYSTEM"] == "raster") qconfigList += "QT_GRAPHICSSYSTEM_RASTER";
+
+        if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+            // These features are not ported to Symbian (yet)
+            qconfigList += "QT_NO_CONCURRENT";
+            qconfigList += "QT_NO_QFUTURE";
+            qconfigList += "QT_NO_CRASHHANDLER";
+            qconfigList += "QT_NO_PRINTER";
+            qconfigList += "QT_NO_SYSTEMTRAYICON";
+        }
 
         qconfigList.sort();
@@ -2743 +3008 @@
 
         // Replace old qconfig.h with new one
-        ::SetFileAttributesA(outName.toLocal8Bit(), FILE_ATTRIBUTE_NORMAL);
+        ::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL);
         QFile::remove(outName);
         tmpFile.copy(outName);
@@ -2779 +3044 @@
 
     outName = defSpec + "/qmake.conf";
-    ::SetFileAttributesA(outName.toLocal8Bit(), FILE_ATTRIBUTE_NORMAL );
+    ::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL );
     QFile qmakeConfFile(outName);
     if (qmakeConfFile.open(QFile::Append | QFile::WriteOnly | QFile::Text)) {
@@ -2798 +3063 @@
         tmpStream << "/* Licensed */" << endl
                   << "static const char qt_configure_licensee_str          [512 + 12] = \"qt_lcnsuser=" << licenseInfo["LICENSEE"] << "\";" << endl
-                  << "static const char qt_configure_licensed_products_str [512 + 12] = \"qt_lcnsprod=" << dictionary["EDITION"] << "\";" << endl;
+                  << "static const char qt_configure_licensed_products_str [512 + 12] = \"qt_lcnsprod=" << dictionary["EDITION"] << "\";" << endl
+                  << endl
+                  << "/* Build date */" << endl
+                  << "static const char qt_configure_installation          [11  + 12] = \"qt_instdate=" << QDate::currentDate().toString(Qt::ISODate) << "\";" << endl
+                  << endl;
         if(!dictionary[ "QT_HOST_PREFIX" ].isNull())
             tmpStream << "#if !defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE)" << endl;
@@ -2847 +3116 @@
 
         // Replace old qconfig.cpp with new one
-        ::SetFileAttributesA(outName.toLocal8Bit(), FILE_ATTRIBUTE_NORMAL );
+        ::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL );
         QFile::remove( outName );
         tmpFile2.copy(outName);
         tmpFile2.close();
+    }
+
+    QTemporaryFile tmpFile3;
+    if (tmpFile3.open()) {
+        tmpStream.setDevice(&tmpFile3);
+        tmpStream << "/* Evaluation license key */" << endl
+                  << "static const char qt_eval_key_data              [512 + 12] = \"qt_qevalkey=" << licenseInfo["LICENSEKEYEXT"] << "\";" << endl;
+
+        tmpStream.flush();
+        tmpFile3.flush();
+
+        outName = buildPath + "/src/corelib/global/qconfig_eval.cpp";
+        ::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL );
+        QFile::remove( outName );
+
+        if (dictionary["EDITION"] == "Evaluation" || qmakeDefines.contains("QT_EVAL"))
+            tmpFile3.copy(outName);
+        tmpFile3.close();
     }
 }
@@ -2902 +3189 @@
     cout << "Maketool...................." << dictionary[ "MAKE" ] << endl;
     cout << "Debug symbols..............." << (dictionary[ "BUILD" ] == "debug" ? "yes" : "no") << endl;
+    cout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl;
     cout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl;
     cout << "STL support................." << dictionary[ "STL" ] << endl;
@@ -2912 +3200 @@
     cout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl;
     cout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
-    cout << "Direct3D support............" << dictionary[ "DIRECT3D" ] << endl;
+    cout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl;
     cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl;
     cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl;
     cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl;
     cout << "Phonon support.............." << dictionary[ "PHONON" ] << endl;
+    cout << "QtMultimedia support........" << dictionary[ "MULTIMEDIA" ] << endl;
     cout << "WebKit support.............." << dictionary[ "WEBKIT" ] << endl;
+    cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl;
+    cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl;
     cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl;
     cout << "Graphics System............." << dictionary[ "GRAPHICS_SYSTEM" ] << endl;
@@ -2928 +3219 @@
     cout << "    JPEG support............" << dictionary[ "JPEG" ] << endl;
     cout << "    PNG support............." << dictionary[ "PNG" ] << endl;
-    cout << "    MNG support............." << dictionary[ "MNG" ] << endl << endl;
+    cout << "    MNG support............." << dictionary[ "MNG" ] << endl;
+    cout << "    FreeType support........" << dictionary[ "FREETYPE" ] << endl << endl;
 
     cout << "Styles:" << endl;
@@ -2939 +3231 @@
     cout << "    CDE....................." << dictionary[ "STYLE_CDE" ] << endl;
     cout << "    Windows CE.............." << dictionary[ "STYLE_WINDOWSCE" ] << endl;
-    cout << "    Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl << endl;
+    cout << "    Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl;
+    cout << "    S60....................." << dictionary[ "STYLE_S60" ] << endl << endl;
 
     cout << "Sql Drivers:" << endl;
@@ -2969 +3262 @@
         cout << "Cetest support.............." << dictionary[ "CETEST" ] << endl;
         cout << "Signature..................." << dictionary[ "CE_SIGNATURE"] << endl << endl;
+    }
+
+    if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("symbian"))) {
+        cout << "Support for S60............." << dictionary[ "S60" ] << endl;
     }
 
@@ -3104 +3401 @@
 void Configure::buildHostTools()
 {
+    if (dictionary[ "NOPROCESS" ] == "yes")
+        dictionary[ "DONE" ] = "yes";
+
     if (!dictionary.contains("XQMAKESPEC"))
         return;
@@ -3110 +3410 @@
     QStringList hostToolsDirs;
     hostToolsDirs
-        << "src/tools/bootstrap"
-        << "src/tools/moc"
-        << "src/tools/rcc"
-        << "src/tools/uic"
-        << "tools/checksdk";
+        << "src/tools"
+        << "tools/linguist/lrelease";
+
+    if(dictionary["XQMAKESPEC"].startsWith("wince"))
+        hostToolsDirs << "tools/checksdk";
 
     if (dictionary[ "CETEST" ] == "yes")
@@ -3327 +3627 @@
         cout << "Processing of project files have been disabled." << endl;
         cout << "Only use this option if you really know what you're doing." << endl << endl;
-        dictionary[ "DONE" ] = "yes";
         return;
     }
@@ -3335 +3634 @@
 {
     QString make = dictionary[ "MAKE" ];
-    cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl;
-    cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    if (!dictionary.contains("XQMAKESPEC")) {
+        cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl;
+        cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    } else if(dictionary.value("QMAKESPEC").startsWith("wince")) {
+        // we are cross compiling for Windows CE
+        cout << endl << endl << "Qt is now configured for building. To start the build run:" << endl
+             << "\tsetcepaths " << dictionary.value("XQMAKESPEC") << endl
+             << "\t" << qPrintable(make) << endl
+             << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl;
+    } else { // Compiling for Symbian OS
+        cout << endl << endl << "Qt is now configured for building. To start the build run:" << qPrintable(dictionary["QTBUILDINSTRUCTION"]) << "." << endl
+        << "To reconfigure, run '" << qPrintable(dictionary["CONFCLEANINSTRUCTION"]) << "' and configure." << endl;
+    }
 }
 
@@ -3378 +3688 @@
     }
 
+    bool haveGpl3 = false;
     QString licenseFile = orgLicenseFile;
     QString theLicense;
     if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
-        theLicense = "GNU General Public License (GPL) version 3 \nor the GNU Lesser General Public License (LGPL) version 2.1";
+        haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3");
+        theLicense = "GNU Lesser General Public License (LGPL) version 2.1";
+        if (haveGpl3)
+            theLicense += "\nor the GNU General Public License (GPL) version 3";
     } else {
         // the first line of the license file tells us which license it is
@@ -3398 +3712 @@
              << endl;
         if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") {
-            cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl;
+            if (haveGpl3)
+                cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl;
             cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl;
         } else {
@@ -3452 +3767 @@
 void Configure::readLicense()
 {
-    dictionary[ "PLATFORM NAME" ]   = (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/src/corelib/kernel/qfunctions_wince.h")
-                                      && (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince")))
-                                        ? "Qt for Windows CE" : "Qt for Windows";
+   if (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/src/corelib/kernel/qfunctions_wince.h") &&
+       (dictionary.value("QMAKESPEC").startsWith("wince") || dictionary.value("XQMAKESPEC").startsWith("wince")))
+        dictionary["PLATFORM NAME"] = "Qt for Windows CE";
+    else if (dictionary.value("XQMAKESPEC").startsWith("symbian"))
+        dictionary["PLATFORM NAME"] = "Qt for Symbian";
+    else
+        dictionary["PLATFORM NAME"] = "Qt for Windows";
+    dictionary["LICENSE FILE"] = sourcePath;
+
     bool openSource = false;
+    bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL");
     if (dictionary["BUILDNOKIA"] == "yes" || dictionary["BUILDTYPE"] == "commercial") {
         openSource = false;
     } else if (dictionary["BUILDTYPE"] == "opensource") {
         openSource = true;
-    } else {
+    } else if (hasOpenSource) { // No Open Source? Just display the commercial license right away
         forever {
             char accept = '?';
@@ -3478 +3800 @@
         }
     }
-    if (openSource) {
-        dictionary["LICENSE FILE"] = sourcePath;
-        if (QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL")) {
-            cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
-            licenseInfo["LICENSEE"] = "Open Source";
-            dictionary["EDITION"] = "OpenSource";
-            dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
-            cout << endl;
-            if (!showLicense(dictionary["LICENSE FILE"])) {
-                cout << "Configuration aborted since license was not accepted";
-                dictionary["DONE"] = "error";
-                return;
-            }
+    if (hasOpenSource && openSource) {
+        cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
+        licenseInfo["LICENSEE"] = "Open Source";
+        dictionary["EDITION"] = "OpenSource";
+        dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
+        cout << endl;
+        if (!showLicense(dictionary["LICENSE FILE"])) {
+            cout << "Configuration aborted since license was not accepted";
+            dictionary["DONE"] = "error";
             return;
         }
-#ifndef COMMERCIAL_VERSION
+    } else if (openSource) {
+        cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
+        dictionary["DONE"] = "error";
+    }
+#ifdef COMMERCIAL_VERSION
     else {
-        cout << endl << "Cannot find the GPL license files!" << endl;
-        dictionary["DONE"] = "error";
-    }
-#else
-    } else {
         Tools::checkLicense(dictionary, licenseInfo, firstLicensePath());
-        if (dictionary["DONE"] != "error") {
+        if (dictionary["DONE"] != "error" && dictionary["BUILDNOKIA"] != "yes") {
             // give the user some feedback, and prompt for license acceptance
             cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " " << dictionary["EDITION"] << " Edition."<< endl << endl;
@@ -3511 +3828 @@
         }
     }
-#endif // COMMERCIAL_VERSION
+#else // !COMMERCIAL_VERSION
+    else {
+        cout << endl << "Cannot build commercial edition from the open source version of the library." << endl;
+        dictionary["DONE"] = "error";
+    }
+#endif
 }
 

trunk/tools/configure/configureapp.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -151 +151 @@
     bool filesDiffer(const QString &file1, const QString &file2);
 
-    static bool findFile(const QString &fileName);
-    static bool findFileInPaths(const QString &fileName, const QStringList &paths);
+    bool findFile(const QString &fileName);
+    static QString findFileInPaths(const QString &fileName, const QString &paths);
 #if !defined(EVAL)
     void reloadCmdLine();

trunk/tools/configure/environment.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -147 +147 @@
 
     HKEY handle = 0;
-    LONG res;
-    QT_WA( {
-        res = RegOpenKeyExW(parentHandle, (WCHAR*)rSubkeyPath.utf16(),
-                            0, KEY_READ, &handle);
-    } , {
-        res = RegOpenKeyExA(parentHandle, rSubkeyPath.toLocal8Bit(),
-                            0, KEY_READ, &handle);
-    } );
-
+    LONG res = RegOpenKeyEx(parentHandle, (wchar_t*)rSubkeyPath.utf16(), 0, KEY_READ, &handle);
     if (res != ERROR_SUCCESS)
         return QString();
@@ -162 +154 @@
     DWORD dataType;
     DWORD dataSize;
-    QT_WA( {
-        res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize);
-    }, {
-        res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, &dataType, 0, &dataSize);
-    } );
+    res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize);
     if (res != ERROR_SUCCESS) {
         RegCloseKey(handle);
@@ -174 +162 @@
     // get the value
     QByteArray data(dataSize, 0);
-    QT_WA( {
-        res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, 0,
-                               reinterpret_cast<unsigned char*>(data.data()), &dataSize);
-    }, {
-        res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, 0,
-                               reinterpret_cast<unsigned char*>(data.data()), &dataSize);
-    } );
+    res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, 0,
+                           reinterpret_cast<unsigned char*>(data.data()), &dataSize);
     if (res != ERROR_SUCCESS) {
         RegCloseKey(handle);
@@ -190 +173 @@
         case REG_EXPAND_SZ:
         case REG_SZ: {
-            QT_WA( {
-                result = QString::fromUtf16(((const ushort*)data.constData()));
-            }, {
-                result = QString::fromLatin1(data.constData());
-            } );
+            result = QString::fromWCharArray(((const wchar_t *)data.constData()));
             break;
         }
@@ -202 +181 @@
             int i = 0;
             for (;;) {
-                QString s;
-                QT_WA( {
-                    s = QString::fromUtf16((const ushort*)data.constData() + i);
-                }, {
-                    s = QString::fromLatin1(data.constData() + i);
-                } );
+                QString s = QString::fromWCharArray((const wchar_t *)data.constData() + i);
                 i += s.length() + 1;
 
@@ -214 +188 @@
                 l.append(s);
             }
-            result = l.join(", ");
+            result = l.join(", ");
             break;
         }
@@ -220 +194 @@
         case REG_NONE:
         case REG_BINARY: {
-            QT_WA( {
-                result = QString::fromUtf16((const ushort*)data.constData(), data.size()/2);
-            }, {
-                result = QString::fromLatin1(data.constData(), data.size());
-            } );
+            result = QString::fromWCharArray((const wchar_t *)data.constData(), data.size() / 2);
             break;
         }
@@ -233 +203 @@
             int i;
             memcpy((char*)&i, data.constData(), sizeof(int));
-            result = QString::number(i);
+            result = QString::number(i);
             break;
         }
@@ -351 +321 @@
     memset(&procInfo, 0, sizeof(procInfo));
 
-    bool couldExecute;
-    QT_WA({
-        // Unicode version
-        STARTUPINFOW startInfo;
-        memset(&startInfo, 0, sizeof(startInfo));
-        startInfo.cb = sizeof(startInfo);
-
-        couldExecute = CreateProcessW(0, (WCHAR*)executable.utf16(),
+    STARTUPINFO startInfo;
+    memset(&startInfo, 0, sizeof(startInfo));
+    startInfo.cb = sizeof(startInfo);
+
+    bool couldExecute = CreateProcess(0, (wchar_t*)executable.utf16(),
                                       0, 0, false,
                                       CREATE_NO_WINDOW | CREATE_SUSPENDED,
                                       0, 0, &startInfo, &procInfo);
-
-    }, {
-        // Ansi version
-        STARTUPINFOA startInfo;
-        memset(&startInfo, 0, sizeof(startInfo));
-        startInfo.cb = sizeof(startInfo);
-
-        couldExecute = CreateProcessA(0, executable.toLocal8Bit().data(),
-                                      0, 0, false,
-                                      CREATE_NO_WINDOW | CREATE_SUSPENDED,
-                                      0, 0, &startInfo, &procInfo);
-    })
 
     if (couldExecute) {
@@ -422 +377 @@
 
 /*!
-    Creates a QByteArray of the \a environment in either UNICODE or
-    ansi representation.
+    Creates a QByteArray of the \a environment.
 */
 static QByteArray qt_create_environment(const QStringList &environment)
 {
     QByteArray envlist;
-    if (!environment.isEmpty()) {
-        int pos = 0;
-        // add PATH if necessary (for DLL loading)
-        QByteArray path = qgetenv("PATH");
-        QT_WA({
-            if (environment.filter(QRegExp("^PATH=",Qt::CaseInsensitive)).isEmpty()
-                && !path.isNull()) {
-                QString tmp = QString(QLatin1String("PATH=%1")).arg(QString::fromLocal8Bit(path));
-                uint tmpSize = sizeof(TCHAR) * (tmp.length()+1);
-                envlist.resize(envlist.size() + tmpSize );
-                memcpy(envlist.data()+pos, tmp.utf16(), tmpSize);
-                pos += tmpSize;
-            }
-            // add the user environment
-            for (QStringList::ConstIterator it = environment.begin(); it != environment.end(); it++ ) {
-                QString tmp = *it;
-                uint tmpSize = sizeof(TCHAR) * (tmp.length()+1);
-                envlist.resize(envlist.size() + tmpSize);
-                memcpy(envlist.data()+pos, tmp.utf16(), tmpSize);
-                pos += tmpSize;
-            }
-            // add the 2 terminating 0 (actually 4, just to be on the safe side)
-            envlist.resize( envlist.size()+4 );
-            envlist[pos++] = 0;
-            envlist[pos++] = 0;
-            envlist[pos++] = 0;
-            envlist[pos++] = 0;
-        }, {
-            if (environment.filter(QRegExp("^PATH=",Qt::CaseInsensitive)).isEmpty() && !path.isNull()) {
-                QByteArray tmp = QString("PATH=%1").arg(QString::fromLocal8Bit(path)).toLocal8Bit();
-                uint tmpSize = tmp.length() + 1;
-                envlist.resize(envlist.size() + tmpSize);
-                memcpy(envlist.data()+pos, tmp.data(), tmpSize);
-                pos += tmpSize;
-            }
-            // add the user environment
-            for (QStringList::ConstIterator it = environment.begin(); it != environment.end(); it++) {
-                QByteArray tmp = (*it).toLocal8Bit();
-                uint tmpSize = tmp.length() + 1;
-                envlist.resize(envlist.size() + tmpSize);
-                memcpy(envlist.data()+pos, tmp.data(), tmpSize);
-                pos += tmpSize;
-            }
-            // add the terminating 0 (actually 2, just to be on the safe side)
-            envlist.resize(envlist.size()+2);
-            envlist[pos++] = 0;
-            envlist[pos++] = 0;
-        })
-    }
+    if (environment.isEmpty())
+        return envlist;
+
+    int pos = 0;
+    // add PATH if necessary (for DLL loading)
+    QByteArray path = qgetenv("PATH");
+    if (environment.filter(QRegExp("^PATH=",Qt::CaseInsensitive)).isEmpty() && !path.isNull()) {
+            QString tmp = QString(QLatin1String("PATH=%1")).arg(QString::fromLocal8Bit(path));
+            uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1);
+            envlist.resize(envlist.size() + tmpSize);
+            memcpy(envlist.data() + pos, tmp.utf16(), tmpSize);
+            pos += tmpSize;
+    }
+    // add the user environment
+    for (QStringList::ConstIterator it = environment.begin(); it != environment.end(); it++ ) {
+            QString tmp = *it;
+            uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1);
+            envlist.resize(envlist.size() + tmpSize);
+            memcpy(envlist.data() + pos, tmp.utf16(), tmpSize);
+            pos += tmpSize;
+    }
+    // add the 2 terminating 0 (actually 4, just to be on the safe side)
+    envlist.resize(envlist.size() + 4);
+    envlist[pos++] = 0;
+    envlist[pos++] = 0;
+    envlist[pos++] = 0;
+    envlist[pos++] = 0;
 
     return envlist;
@@ -502 +434 @@
     qDebug() << "   " << removeEnv;
 #endif
-// GetEnvironmentStrings is defined to GetEnvironmentStringsW when
-// UNICODE is defined. We cannot use that, since we need to
-// destinguish between unicode and ansi versions of the functions.
-#if defined(UNICODE) && defined(GetEnvironmentStrings)
-#undef GetEnvironmentStrings
-#endif
-
     // Create the full environment from the current environment and
     // the additionalEnv strings, then remove all variables defined
     // in removeEnv
     QMap<QString, QString> fullEnvMap;
-    QT_WA({
-        LPWSTR envStrings = GetEnvironmentStringsW();
-        if (envStrings) {
-            int strLen = 0;
-            for (LPWSTR envString = envStrings; *(envString); envString += strLen + 1) {
-                strLen = wcslen(envString);
-                QString str = QString((const QChar*)envString, strLen);
-                if (!str.startsWith("=")) { // These are added by the system
-                    int sepIndex = str.indexOf('=');
-                    fullEnvMap.insert(str.left(sepIndex).toUpper(), str.mid(sepIndex +1));
-                }
+    LPWSTR envStrings = GetEnvironmentStrings();
+    if (envStrings) {
+        int strLen = 0;
+        for (LPWSTR envString = envStrings; *(envString); envString += strLen + 1) {
+            strLen = wcslen(envString);
+            QString str = QString((const QChar*)envString, strLen);
+            if (!str.startsWith("=")) { // These are added by the system
+                int sepIndex = str.indexOf('=');
+                fullEnvMap.insert(str.left(sepIndex).toUpper(), str.mid(sepIndex +1));
             }
         }
-        FreeEnvironmentStringsW(envStrings);
-    }, {
-        LPSTR envStrings = GetEnvironmentStrings();
-        if (envStrings) {
-            int strLen = 0;
-            for (LPSTR envString = envStrings; *(envString); envString += strLen + 1) {
-                strLen = strlen(envString);
-                QString str = QLatin1String(envString);
-                if (!str.startsWith("=")) { // These are added by the system
-                    int sepIndex = str.indexOf('=');
-                    fullEnvMap.insert(str.left(sepIndex).toUpper(), str.mid(sepIndex +1));
-                }
-            }
-        }
-        FreeEnvironmentStringsA(envStrings);
-    })
+    }
+    FreeEnvironmentStrings(envStrings);
+
     // Add additionalEnv variables
     for (int i = 0; i < additionalEnv.count(); ++i) {
@@ -570 +480 @@
     memset(&procInfo, 0, sizeof(procInfo));
 
-    bool couldExecute;
-    QT_WA({
-        // Unicode version
-        STARTUPINFOW startInfo;
-        memset(&startInfo, 0, sizeof(startInfo));
-        startInfo.cb = sizeof(startInfo);
-
-        couldExecute = CreateProcessW(0, (WCHAR*)args.utf16(),
+    STARTUPINFO startInfo;
+    memset(&startInfo, 0, sizeof(startInfo));
+    startInfo.cb = sizeof(startInfo);
+
+    bool couldExecute = CreateProcess(0, (wchar_t*)args.utf16(),
                                       0, 0, true, CREATE_UNICODE_ENVIRONMENT,
                                       envlist.isEmpty() ? 0 : envlist.data(),
                                       0, &startInfo, &procInfo);
-    }, {
-        // Ansi version
-        STARTUPINFOA startInfo;
-        memset(&startInfo, 0, sizeof(startInfo));
-        startInfo.cb = sizeof(startInfo);
-
-        couldExecute = CreateProcessA(0, args.toLocal8Bit().data(),
-                                      0, 0, true, 0,
-                                      envlist.isEmpty() ? 0 : envlist.data(),
-                                      0, &startInfo, &procInfo);
-    })
 
     if (couldExecute) {
@@ -655 +551 @@
             QFile::remove(destFile);
             intermediate = QFile::copy(entry.absoluteFilePath(), destFile);
-            SetFileAttributesA(destFile.toLocal8Bit(), FILE_ATTRIBUTE_NORMAL);
+            SetFileAttributes((wchar_t*)destFile.utf16(), FILE_ATTRIBUTE_NORMAL);
         }
         if(!intermediate) {

trunk/tools/configure/environment.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/tools/configure/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -93 +93 @@
     if( !app.isDone() )
         app.buildQmake();
-    if( !app.isOk() )
-        return 2;
 #endif
     if( !app.isDone() )
         app.generateMakefiles();
-    if( app.isOk() )
+    if( !app.isDone() )
         app.buildHostTools();
     if( !app.isDone() )
         app.showSummary();
+    if( !app.isOk() )
+        return 2;
 
     return 0;

trunk/tools/configure/tools.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -59 +59 @@
                          const QString &path)
 {
+    if (dictionary[ "BUILDNOKIA" ] == "yes") {
+        dictionary["EDITION"] = "NokiaInternalBuild";
+        dictionary["LICENSE_FILE"] = ""; // No License for nokia developers
+        dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
+        return; // No license key checking in internal builds
+    }
+
     QString tpLicense = dictionary["QT_SOURCE_TREE"] + "/LICENSE.PREVIEW.OPENSOURCE";
     if (QFile::exists(tpLicense)) {
@@ -104 +111 @@
     // Verify license info...
     QString licenseKey = licenseInfo["LICENSEKEYEXT"];
-    const char * clicenseKey = licenseKey.toLatin1();
+    QByteArray clicenseKey = licenseKey.toLatin1();
     //We check the licence
-#ifndef _WIN32_WCE
-        char *buffer = strdup(clicenseKey);
-#else
-        char *buffer = (char*) malloc(strlen(clicenseKey) + 1);
-        strcpy(buffer, clicenseKey);
-#endif
     static const char * const SEP = "-";
     char *licenseParts[NUMBER_OF_PARTS];
     int partNumber = 0;
-    for (char *part = strtok(buffer, SEP); part != 0; part = strtok(0, SEP))
+    for (char *part = strtok(clicenseKey.data(), SEP); part != 0; part = strtok(0, SEP))
         licenseParts[partNumber++] = part;
     if (partNumber < (NUMBER_OF_PARTS-1)) {
         dictionary["DONE"] = "error";
         cout << "License file does not contain proper license key." <<partNumber<< endl;
-        free(buffer);
         return;
     }
 
     char products = licenseParts[0][0];
-    char platforms = licenseParts[1][0];
+    char* platforms = licenseParts[1];
     char* licenseSchema = licenseParts[2];
     char licenseFeatures = licenseParts[3][0];
@@ -143 +143 @@
             dictionary["QT_EDITION"] = "QT_EDITION_DESKTOPLIGHT";
         }
-
-        if (platforms == 'X') {
-            dictionary["LICENSE_EXTENSION"] = "-ALLOS";
-        } else if (strchr("3679ACDEHJKMSUWX", platforms)) {
-            dictionary["LICENSE_EXTENSION"] = "-EMBEDDED";
-        } else if (strchr("4BFPQRTY", platforms)) {
-            dictionary["LICENSE_EXTENSION"] = "-DESKTOP";
-        }
     } else if (strcmp(licenseSchema,"Z4M") == 0 || strcmp(licenseSchema,"R4M") == 0 || strcmp(licenseSchema,"Q4M") == 0) {
         if (products == 'B') {
             dictionary["EDITION"] = "Evaluation";
             dictionary["QT_EDITION"] = "QT_EDITION_EVALUATION";
-            dictionary["LICENSE_EXTENSION"] = "-EVALUATION";
-        }
-    }
+        }
+    }
+
+    if (platforms[2] == 'L') {
+        static const char src[] = "8NPQRTZ";
+        static const char dst[] = "UCWX9M7";
+        const char *p = strchr(src, platforms[1]);
+        platforms[1] = dst[p - src];
+    }
+
+#define PL(a,b) (int(a)+int(b)*256)
+    int platformCode = PL(platforms[0],platforms[1]);
+    switch (platformCode) {
+    case PL('X','9'):
+    case PL('X','C'):
+    case PL('X','U'):
+    case PL('X','W'):
+        case PL('X','M'): // old license key
+        dictionary["LICENSE_EXTENSION"] = "-ALLOS";
+        break;
+
+    case PL('6', 'M'):
+    case PL('8', 'M'):
+        case PL('K', 'M'): // old license key
+    case PL('N', '7'):
+    case PL('N', '9'):
+    case PL('N', 'X'):
+    case PL('S', '9'):
+    case PL('S', 'C'):
+    case PL('S', 'U'):
+    case PL('S', 'W'):
+        dictionary["LICENSE_EXTENSION"] = "-EMBEDDED";
+        if (dictionary["PLATFORM NAME"].contains("Windows CE")
+            && platformCode != PL('6', 'M') && platformCode != PL('S', '9')
+            && platformCode != PL('S', 'C') && platformCode != PL('S', 'U')
+            && platformCode != PL('S', 'W') && platformCode != PL('K', 'M')) {
+            dictionary["DONE"] = "error";
+        } else if (dictionary["PLATFORM NAME"].contains("Symbian")
+                   && platformCode != PL('N', '9') && platformCode != PL('S', '9')
+                   && platformCode != PL('S', 'C') && platformCode != PL('S', 'U')
+                   && platformCode != PL('S', 'W')) {
+            dictionary["DONE"] = "error";
+        }
+        break;
+    case PL('R', 'M'):
+    case PL('F', 'M'):
+        dictionary["LICENSE_EXTENSION"] = "-DESKTOP";
+        if (!dictionary["PLATFORM NAME"].endsWith("Windows")) {
+            dictionary["DONE"] = "error";
+        }
+        break;
+    default:
+        dictionary["DONE"] = "error";
+        break;
+    }
+#undef PL
+
+    if (dictionary.value("DONE") == "error") {
+        cout << "You are not licensed for the " << dictionary["PLATFORM NAME"] << " platform." << endl << endl;
+        cout << "Please contact qt-info@nokia.com to upgrade your license" << endl;
+        cout << "to include the " << dictionary["PLATFORM NAME"] << " platform, or install the" << endl;
+        cout << "Qt Open Source Edition if you intend to develop free software." << endl;
+        return;
+    }
+
+    // Override for evaluation licenses
+    if (dictionary["Edition"] == "Evaluation")
+        dictionary["LICENSE_EXTENSION"] = "-EVALUATION";
 
     if (QFile::exists(dictionary["QT_SOURCE_TREE"] + "/.LICENSE")) {
@@ -174 +231 @@
     }
 
-    if (dictionary["PLATFORM NAME"].contains("Windows CE")) {
-        // verify that we are licensed to use Qt for Windows CE
-        if (dictionary["LICENSE_EXTENSION"] != "-EMBEDDED" && dictionary["LICENSE_EXTENSION"] != "-ALLOS") {
-            cout << "You are not licensed for the " << dictionary["PLATFORM NAME"] << " platform." << endl << endl;
-            cout << "Please contact sales@trolltech.com to upgrade your license" << endl;
-            cout << "to include the " << dictionary["PLATFORM NAME"] << " platform, or install the" << endl;
-            cout << "Qt Open Source Edition if you intend to develop free software." << endl;
-            dictionary["DONE"] = "error";
-            return;
-        }
-    }
-
     // copy one of .LICENSE-*(-US) to LICENSE
     QString toLicenseFile   = dictionary["QT_SOURCE_TREE"] + "/LICENSE";
     QString fromLicenseFile = dictionary["QT_SOURCE_TREE"] + "/.LICENSE" + dictionary["LICENSE_EXTENSION"];
-    if (licenseFeatures == 'G') //US
+    if (licenseFeatures == 'B' || licenseFeatures == 'G'
+        || licenseFeatures == 'L' || licenseFeatures == 'Y')
         fromLicenseFile += "-US";
 
-    if (licenseFeatures == '5') //Floating
-        dictionary["METERED LICENSE"] = "true";
-
-    if (!CopyFileA(QDir::toNativeSeparators(fromLicenseFile).toLocal8Bit(),
-        QDir::toNativeSeparators(toLicenseFile).toLocal8Bit(), FALSE)) {
+    if (!CopyFile((wchar_t*)QDir::toNativeSeparators(fromLicenseFile).utf16(),
+        (wchar_t*)QDir::toNativeSeparators(toLicenseFile).utf16(), FALSE)) {
         cout << "Failed to copy license file (" << fromLicenseFile << ")";
         dictionary["DONE"] = "error";
@@ -202 +245 @@
     }
     dictionary["LICENSE FILE"] = toLicenseFile;
-    free(buffer);
 }
 

trunk/tools/configure/tools.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **