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

3 files changed, 47 insertions, 71 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5eaa39f..4d74573 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -121,7 +121,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const
     QDir d;
     if(path.startsWith(QDir::separator())) {
         d.cd(QString(QDir::separator()));
-        path = path.right(path.length() - 1);
+        path.remove(0, 1);
     }
     bool ret = true;
 #ifdef Q_OS_WIN
@@ -129,7 +129,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const
     if(!QDir::isRelativePath(path)) {
         if(QFile::exists(path.left(3))) {
             d.cd(path.left(3));
-            path = path.right(path.length() - 3);
+            path.remove(0, 3);
         } else {
             warn_msg(WarnLogic, "Cannot access drive '%s' (%s)",
                      path.left(3).toLatin1().data(), path.toLatin1().data());
@@ -201,13 +201,13 @@ MakefileGenerator::initOutPaths()
         if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() &&
            v.contains("QMAKE_ABSOLUTE_SOURCE_ROOT")) {
             QString root = v["QMAKE_ABSOLUTE_SOURCE_ROOT"].first();
-            root = Option::fixPathToTargetOS(root);
+            root = QDir::fromNativeSeparators(root);
             if(!root.isEmpty()) {
                 QFileInfo fi = fileInfo(Option::mkfile::cachefile);
                 if(!fi.makeAbsolute()) {
                     QString cache_r = fi.path(), pwd = Option::output_dir;
                     if(pwd.startsWith(cache_r) && !pwd.startsWith(root)) {
-                        pwd = Option::fixPathToTargetOS(root + pwd.mid(cache_r.length()));
+                        pwd = root + pwd.mid(cache_r.length());
                         if(exists(pwd))
                             v.insert("QMAKE_ABSOLUTE_SOURCE_PATH", QStringList(pwd));
                     }
@@ -217,7 +217,7 @@ MakefileGenerator::initOutPaths()
     }
     if(!v["QMAKE_ABSOLUTE_SOURCE_PATH"].isEmpty()) {
         QString &asp = v["QMAKE_ABSOLUTE_SOURCE_PATH"].first();
-        asp = Option::fixPathToTargetOS(asp);
+        asp = QDir::fromNativeSeparators(asp);
         if(asp.isEmpty() || asp == Option::output_dir) //if they're the same, why bother?
             v["QMAKE_ABSOLUTE_SOURCE_PATH"].clear();
     }
@@ -243,7 +243,7 @@ MakefileGenerator::initOutPaths()
         if(!(dirs[x] == "DLLDESTDIR"))
 #endif
         {
-            if(pathRef.right(Option::dir_sep.length()) != Option::dir_sep)
+            if(!pathRef.endsWith(Option::dir_sep))
                 pathRef += Option::dir_sep;
         }
 
@@ -346,7 +346,7 @@ MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &v
                     QString real_dir = Option::fixPathToLocalOS((*vpath_it));
                     if(exists(real_dir + QDir::separator() + val)) {
                         QString dir = (*vpath_it);
-                        if(dir.right(Option::dir_sep.length()) != Option::dir_sep)
+                        if(!dir.endsWith(Option::dir_sep))
                             dir += Option::dir_sep;
                         val = dir + val;
                         if(!(flags & VPATH_NoFixify))
@@ -365,7 +365,7 @@ MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &v
                     real_dir = dir;
                     if(!(flags & VPATH_NoFixify))
                         real_dir = fileFixify(real_dir, qmake_getpwd(), Option::output_dir);
-                    regex = regex.right(regex.length() - dir.length());
+                    regex.remove(0, dir.length());
                 }
                 if(real_dir.isEmpty() || exists(real_dir)) {
                     QStringList files = QDir(real_dir).entryList(QStringList(regex));
@@ -725,14 +725,14 @@ MakefileGenerator::init()
         if(project->isActiveConfig("qmake_cache")) {
             QString cache_file;
             if(!project->isEmpty("QMAKE_INTERNAL_CACHE_FILE")) {
-                cache_file = Option::fixPathToLocalOS(project->first("QMAKE_INTERNAL_CACHE_FILE"));
+                cache_file = QDir::fromNativeSeparators(project->first("QMAKE_INTERNAL_CACHE_FILE"));
             } else {
                 cache_file = ".qmake.internal.cache";
                 if(project->isActiveConfig("build_pass"))
                     cache_file += ".BUILD." + project->first("BUILD_PASS");
             }
-            if(cache_file.indexOf(QDir::separator()) == -1)
-                cache_file.prepend(Option::output_dir + QDir::separator());
+            if(cache_file.indexOf('/') == -1)
+                cache_file.prepend(Option::output_dir + '/');
             QMakeSourceFileInfo::setCacheFile(cache_file);
         }
 
@@ -789,7 +789,7 @@ MakefileGenerator::init()
                         QString dir, regex = Option::fixPathToLocalOS((*dep_it));
                         if(regex.lastIndexOf(Option::dir_sep) != -1) {
                             dir = regex.left(regex.lastIndexOf(Option::dir_sep) + 1);
-                            regex = regex.right(regex.length() - dir.length());
+                            regex.remove(0, dir.length());
                         }
                         QStringList files = QDir(dir).entryList(QStringList(regex));
                         if(files.isEmpty()) {
@@ -939,7 +939,7 @@ MakefileGenerator::writePrlFile(QTextStream &t)
     QString target = project->first("TARGET");
     int slsh = target.lastIndexOf(Option::dir_sep);
     if(slsh != -1)
-        target = target.right(target.length() - slsh - 1);
+        target.remove(0, slsh + 1);
     QString bdir = Option::output_dir;
     if(bdir.isEmpty())
         bdir = qmake_getpwd();
@@ -1057,11 +1057,11 @@ MakefileGenerator::prlFileName(bool fixify)
         ret = project->first("TARGET");
     int slsh = ret.lastIndexOf(Option::dir_sep);
     if(slsh != -1)
-        ret = ret.right(ret.length() - slsh);
+        ret.remove(0, slsh);
     if(!ret.endsWith(Option::prl_ext)) {
         int dot = ret.indexOf('.');
         if(dot != -1)
-            ret = ret.left(dot);
+            ret.truncate(dot);
         ret += Option::prl_ext;
     }
     if(!project->isEmpty("QMAKE_BUNDLE"))
@@ -1211,7 +1211,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
         if(project->values((*it) + ".CONFIG").indexOf("no_path") == -1 &&
            project->values((*it) + ".CONFIG").indexOf("dummy_install") == -1) {
             dst = fileFixify(unescapeFilePath(project->values(pvar).first()), FileFixifyAbsolute, false);
-            if(dst.right(1) != Option::dir_sep)
+            if(!dst.endsWith(Option::dir_sep))
                 dst += Option::dir_sep;
         }
         dst = escapeFilePath(dst);
@@ -1240,9 +1240,9 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
                 int slsh = filestr.lastIndexOf(Option::dir_sep);
                 if(slsh != -1) {
                     dirstr = filestr.left(slsh+1);
-                    filestr = filestr.right(filestr.length() - slsh - 1);
+                    filestr.remove(0, slsh+1);
                 }
-                if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
+                if(!dirstr.endsWith(Option::dir_sep))
                     dirstr += Option::dir_sep;
                 if(exists(wild)) { //real file
                     QString file = wild;
@@ -1342,7 +1342,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n
             const QStringList &dirs = project->values(pvar);
             for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
                 QString tmp_dst = fileFixify((*pit), FileFixifyAbsolute, false);
-                if (!isWindowsShell() && tmp_dst.right(1) != Option::dir_sep)
+                if (!isWindowsShell() && !tmp_dst.endsWith(Option::dir_sep))
                     tmp_dst += Option::dir_sep;
                 t << mkdir_p_asstring(filePrefixRoot(root, tmp_dst)) << "\n\t";
             }
@@ -2277,8 +2277,8 @@ MakefileGenerator::findSubDirsSubTargets() const
                     st->profile = file.section(Option::dir_sep, -1) + Option::pro_ext;
                 st->in_directory = file;
             }
-            while(st->in_directory.right(1) == Option::dir_sep)
-                st->in_directory = st->in_directory.left(st->in_directory.length() - 1);
+            while(st->in_directory.endsWith(Option::dir_sep))
+                st->in_directory.chop(1);
             if(fileInfo(st->in_directory).isRelative())
                 st->out_directory = st->in_directory;
             else
@@ -2358,7 +2358,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
     if (!(flags & SubTargetSkipDefaultVariables)) {
         QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
         if(ofile.lastIndexOf(Option::dir_sep) != -1)
-            ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
+            ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
         t << "MAKEFILE      = " << ofile << endl;
         /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
          * back-slashes to be turned into slashes. */
@@ -2802,11 +2802,13 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
         return cacheVal;
 
     //do the fixin'
-    const QString pwd = qmake_getpwd() + "/";
+    QString pwd = qmake_getpwd();
+    if (!pwd.endsWith('/'))
+        pwd += '/';
     QString orig_file = ret;
     if(ret.startsWith(QLatin1Char('~'))) {
         if(ret.startsWith(QLatin1String("~/")))
-            ret = QDir::homePath() + Option::dir_sep + ret.mid(1);
+            ret = QDir::homePath() + ret.mid(1);
         else
             warn_msg(WarnLogic, "Unable to expand ~ in %s", ret.toLatin1().constData());
     }
@@ -2895,13 +2897,13 @@ MakefileGenerator::checkMultipleDefinition(const QString &f, const QString &w)
     QString file = f;
     int slsh = f.lastIndexOf(Option::dir_sep);
     if(slsh != -1)
-        file = file.right(file.length() - slsh - 1);
+        file.remove(0, slsh + 1);
     QStringList &l = project->values(w);
     for(QStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) {
         QString file2((*val_it));
         slsh = file2.lastIndexOf(Option::dir_sep);
         if(slsh != -1)
-            file2 = file2.right(file2.length() - slsh - 1);
+            file2.remove(0, slsh + 1);
         if(file2 == file) {
             warn_msg(WarnLogic, "Found potential symbol conflict of %s (%s) in %s",
                      file.toLatin1().constData(), (*val_it).toLatin1().constData(), w.toLatin1().constData());
@@ -3055,7 +3057,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
                 file.setFileName(Option::output_dir + "/" + file.fileName()); //pwd when qmake was run
             QFileInfo fi(fileInfo(file.fileName()));
             if(fi.isDir())
-                outdir = file.fileName() + QDir::separator();
+                outdir = file.fileName() + '/';
         }
         if(!outdir.isEmpty() || file.fileName().isEmpty()) {
             QString fname = "Makefile";
@@ -3075,7 +3077,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
         file.setFileName(file.fileName() + "." + build);
     if(project->isEmpty("QMAKE_MAKEFILE"))
         project->values("QMAKE_MAKEFILE").append(file.fileName());
-    int slsh = file.fileName().lastIndexOf(Option::dir_sep);
+    int slsh = file.fileName().lastIndexOf('/');
     if(slsh != -1)
         mkdir(file.fileName().left(slsh));
     if(file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
@@ -3085,9 +3087,13 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
             od = fileInfo(fi.readLink()).absolutePath();
         else
             od = fi.path();
-        od = Option::fixPathToTargetOS(od);
-        if(QDir::isRelativePath(od))
-            od.prepend(Option::output_dir);
+        od = QDir::fromNativeSeparators(od);
+        if(QDir::isRelativePath(od)) {
+            QString dir = Option::output_dir;
+            if (!dir.endsWith('/') && !od.isEmpty())
+                dir += '/';
+            od.prepend(dir);
+        }
         Option::output_dir = od;
         return true;
     }
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 63b0f17..d36be3c 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -294,9 +294,9 @@ SubdirsMetaMakefileGenerator::init()
     init_flag = true;
 
     if(Option::recursive) {
-        QString old_output_dir = QDir::cleanPath(Option::output_dir);
+        QString old_output_dir = Option::output_dir;
 	QString old_output = Option::output.fileName();
-        QString oldpwd = QDir::cleanPath(qmake_getpwd());
+        QString oldpwd = qmake_getpwd();
         QString thispwd = oldpwd;
         if(!thispwd.endsWith('/'))
            thispwd += '/';
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 303e3e1..78a552b 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -120,14 +120,7 @@ static QString 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();
@@ -135,11 +128,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     // 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();
@@ -147,13 +136,8 @@ static QString 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();
@@ -163,11 +147,7 @@ static QString 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;
         }
 
@@ -175,12 +155,7 @@ static QString 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())
@@ -193,11 +168,7 @@ static QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
 
         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;
         }
 
@@ -1268,9 +1239,8 @@ void VcprojGenerator::initDeploymentTool()
     foreach(QString item, project->values("DEPLOYMENT")) {
         // get item.path
         QString devicePath = project->first(item + ".path");
-        // if the path does not exist, skip it
         if (devicePath.isEmpty())
-            continue;
+            devicePath = targetPath;
         // check if item.path is relative (! either /,\ or %)
         if (!(devicePath.at(0) == QLatin1Char('/')
             || devicePath.at(0) == QLatin1Char('\\')