Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

6 files changed, 131 insertions, 208 deletions

diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index b82104e8d1..14a5a95017 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -3,7 +3,7 @@ DESTDIR   = ../..
 
 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
 
 
 win32 : !win32-mwc : LIBS += -lole32 -ladvapi32
@@ -35,6 +35,7 @@ HEADERS  = configureapp.h environment.h tools.h\
            $$QT_SOURCE_TREE/src/corelib/tools/qlist.h \
            $$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 \
            $$QT_SOURCE_TREE/src/corelib/global/qnumeric.h \
@@ -67,6 +68,7 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qlistdata.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 \
            $$QT_SOURCE_TREE/src/corelib/global/qnumeric.cpp \
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a50019f36c..be1ec71968 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -116,16 +116,9 @@ Configure::Configure( int& argc, char** argv )
 
 
     // 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();
     buildPath = QDir::currentPath();
@@ -615,10 +608,13 @@ void Configure::parseCmdLine()
         // cetest ---------------------------------------------------
         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 -------------------------------------
         else if( configCmdLine.at(i) == "-signature") {
@@ -1202,6 +1198,10 @@ void Configure::parseCmdLine()
 
     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)
     for( QStringList::Iterator dis = disabledModules.begin(); dis != disabledModules.end(); ++dis ) {
@@ -1794,39 +1794,49 @@ bool Configure::displayHelp()
     return false;
 }
 
-bool Configure::findFileInPaths(const QString &fileName, const QStringList &paths)
+QString Configure::findFileInPaths(const QString &fileName, const QString &paths)
 {
+#if defined(Q_OS_WIN32)
+    QRegExp splitReg("[;,]");
+#else
+    QRegExp splitReg("[:]");
+#endif
+    QStringList pathList = paths.split(splitReg, QString::SkipEmptyParts);
     QDir d;
-    for( QStringList::ConstIterator it = paths.begin(); it != paths.end(); ++it ) {
+    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( "\"" ) )
+        if ( path.startsWith( '\"' ) )
             path = path.right( path.length() - 1 );
-        if ( path.endsWith( "\"" ) )
+        if ( path.endsWith( '\"' ) )
             path = path.left( path.length() - 1 );
         if( d.exists( path + QDir::separator() + fileName ) )
-            return true;
+            return path;
     }
-    return false;
+    return QString();
 }
 
 bool Configure::findFile( const QString &fileName )
 {
-    QString file = fileName.toLower();
-    QStringList paths;
-#if defined(Q_OS_WIN32)
-    QRegExp splitReg("[;,]");
-#else
-    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);
+    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();
 }
 
 /*!
@@ -1896,7 +1906,7 @@ bool Configure::checkAvailability(const QString &part)
 {
     bool available = false;
     if (part == "STYLE_WINDOWSXP")
-        available = (dictionary.value("QMAKESPEC") == "win32-g++" || findFile("uxtheme.h"));
+        available = (findFile("uxtheme.h"));
 
     else if (part == "ZLIB")
         available = findFile("zlib.h");
@@ -1971,6 +1981,11 @@ bool Configure::checkAvailability(const QString &part)
             dictionary[ "QT_CE_RAPI_INC" ] += QLatin1String("\"") + rapiHeader + QLatin1String("\"");
             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")
         available = findFile("BuildConsole.exe") && findFile("xgConsole.exe");
@@ -1982,13 +1997,22 @@ bool Configure::checkAvailability(const QString &part)
                && dictionary.value("QMAKESPEC") != "win32-msvc2002"
                && dictionary.value("EXCEPTIONS") == "yes";
     } 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 == "WEBKIT") {
         available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++");
@@ -2152,7 +2176,6 @@ bool Configure::verifyConfiguration()
      no-gif gif
      dll staticlib
 
-     internal
      nocrosscompiler
      GNUmake
      largefile
@@ -2928,7 +2951,7 @@ void Configure::generateConfigfiles()
         tmpFile.flush();
 
         // 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);
         tmpFile.close();
@@ -2964,7 +2987,7 @@ void Configure::generateConfigfiles()
     }
 
     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)) {
         QTextStream qmakeConfStream;
@@ -3032,7 +3055,7 @@ void Configure::generateConfigfiles()
         tmpFile2.flush();
 
         // 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();
@@ -3296,6 +3319,9 @@ void Configure::buildQmake()
 
 void Configure::buildHostTools()
 {
+    if (dictionary[ "NOPROCESS" ] == "yes")
+        dictionary[ "DONE" ] = "yes";
+
     if (!dictionary.contains("XQMAKESPEC"))
         return;
 
@@ -3521,7 +3547,6 @@ void Configure::generateMakefiles()
     } else {
         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;
     }
 }
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index dc22ac9a74..03df28e300 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -150,8 +150,8 @@ private:
     QString fixSeparators(QString somePath);
     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();
     void saveCmdLine();
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 6dc8940095..b4c61f867f 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -146,26 +146,14 @@ QString Environment::readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     QString rSubkeyPath = keyPath(rSubkey);
 
     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();
 
     // get the size and type of the value
     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);
         return QString();
@@ -173,13 +161,8 @@ QString Environment::readRegistryKey(HKEY parentHandle, const QString &rSubkey)
 
     // 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);
         return QString();
@@ -189,11 +172,7 @@ QString Environment::readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     switch (dataType) {
         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;
         }
 
@@ -201,29 +180,20 @@ QString Environment::readRegistryKey(HKEY parentHandle, const QString &rSubkey)
             QStringList l;
             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;
 
                 if (s.isEmpty())
                     break;
                 l.append(s);
             }
-	    result = l.join(", ");
+            result = l.join(", ");
             break;
         }
 
         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;
         }
 
@@ -232,7 +202,7 @@ QString Environment::readRegistryKey(HKEY parentHandle, const QString &rSubkey)
             Q_ASSERT(data.size() == sizeof(int));
             int i;
             memcpy((char*)&i, data.constData(), sizeof(int));
-	    result = QString::number(i);
+            result = QString::number(i);
             break;
         }
 
@@ -350,29 +320,14 @@ bool Environment::detectExecutable(const QString &executable)
     PROCESS_INFORMATION procInfo;
     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(),
-                                      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);
+    STARTUPINFO startInfo;
+    memset(&startInfo, 0, sizeof(startInfo));
+    startInfo.cb = sizeof(startInfo);
 
-        couldExecute = CreateProcessA(0, executable.toLocal8Bit().data(),
+    bool couldExecute = CreateProcess(0, (wchar_t*)executable.utf16(),
                                       0, 0, false,
                                       CREATE_NO_WINDOW | CREATE_SUSPENDED,
                                       0, 0, &startInfo, &procInfo);
-    })
 
     if (couldExecute) {
         CloseHandle(procInfo.hThread);
@@ -421,61 +376,38 @@ static QString qt_create_commandline(const QString &program, const QStringList &
 }
 
 /*!
-    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;
 }
@@ -501,46 +433,24 @@ int Environment::execute(QStringList arguments, const QStringList &additionalEnv
     qDebug() << "   " << additionalEnv;
     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));
-                }
-            }
-        }
-        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));
-                }
+    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));
             }
         }
-        FreeEnvironmentStringsA(envStrings);
-    })
+    }
+    FreeEnvironmentStrings(envStrings);
+
     // Add additionalEnv variables
     for (int i = 0; i < additionalEnv.count(); ++i) {
         const QString &str = additionalEnv.at(i);
@@ -569,28 +479,14 @@ int Environment::execute(QStringList arguments, const QStringList &additionalEnv
     PROCESS_INFORMATION procInfo;
     memset(&procInfo, 0, sizeof(procInfo));
 
-    bool couldExecute;
-    QT_WA({
-        // Unicode version
-        STARTUPINFOW startInfo;
-        memset(&startInfo, 0, sizeof(startInfo));
-        startInfo.cb = sizeof(startInfo);
+    STARTUPINFO startInfo;
+    memset(&startInfo, 0, sizeof(startInfo));
+    startInfo.cb = sizeof(startInfo);
 
-        couldExecute = CreateProcessW(0, (WCHAR*)args.utf16(),
+    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) {
         WaitForSingleObject(procInfo.hProcess, INFINITE);
@@ -654,7 +550,7 @@ bool Environment::cpdir(const QString &srcDir, const QString &destDir)
 #endif
 	    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) {
 	    qDebug() << "cpdir: Failure for " << entry.fileName() << entry.isDir();
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 0e13c7a3b8..e5c04cc911 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -95,7 +95,7 @@ int runConfigure( int argc, char** argv )
 #endif
     if( !app.isDone() )
 	app.generateMakefiles();
-    if( !app.isDone() && app.isOk() )
+    if( !app.isDone() )
 	app.buildHostTools();
     if( !app.isDone() )
 	app.showSummary();
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index f60f72c254..708a537c62 100644
--- a/tools/configure/tools.cpp
+++ b/tools/configure/tools.cpp
@@ -201,8 +201,8 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString
     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";
         return;