Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

7 files changed, 37 insertions, 29 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 1a45fe6..613a72f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -105,7 +105,7 @@ void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories()
     PluginDatabase* db = PluginDatabase::installedPlugins(/* populate */ false);
 
     Vector<String> paths;
-    String qtPath(getenv("QTWEBKIT_PLUGIN_PATH"));
+    String qtPath(qgetenv("QTWEBKIT_PLUGIN_PATH").data());
     qtPath.split(UChar(':'), /* allowEmptyEntries */ false, paths);
 
     db->setPluginDirectories(paths);
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index eae17b4..d8da606 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -372,32 +372,30 @@ void QProcessPrivate::startProcess()
     qDebug("   pass environment : %s", environment.isEmpty() ? "no" : "yes");
 #endif
 
-    DWORD dwCreationFlags = CREATE_NO_WINDOW;
-
 #if defined(Q_OS_WINCE)
-        QString fullPathProgram = program;
-        if (!QDir::isAbsolutePath(fullPathProgram))
-            fullPathProgram = QFileInfo(fullPathProgram).absoluteFilePath();
-        fullPathProgram.replace(QLatin1Char('/'), QLatin1Char('\\'));
-        success = CreateProcess((wchar_t*)fullPathProgram.utf16(),
-                                (wchar_t*)args.utf16(),
-                                0, 0, false, 0, 0, 0, 0, pid);
+    QString fullPathProgram = program;
+    if (!QDir::isAbsolutePath(fullPathProgram))
+        fullPathProgram = QFileInfo(fullPathProgram).absoluteFilePath();
+    fullPathProgram.replace(QLatin1Char('/'), QLatin1Char('\\'));
+    success = CreateProcess((wchar_t*)fullPathProgram.utf16(),
+                            (wchar_t*)args.utf16(),
+                            0, 0, false, 0, 0, 0, 0, pid);
 #else
-        dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
-        STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
-	                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
-                                   (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
-                                   0, 0, 0,
-                                   STARTF_USESTDHANDLES,
-                                   0, 0, 0,
-                                   stdinChannel.pipe[0], stdoutChannel.pipe[1], stderrChannel.pipe[1]
-        };
-        success = CreateProcess(0, (wchar_t*)args.utf16(),
-                                0, 0, TRUE, dwCreationFlags,
-                                environment ? envlist.data() : 0,
-                                workingDirectory.isEmpty() ? 0
-                                    : (wchar_t*)QDir::toNativeSeparators(workingDirectory).utf16(),
-                                &startupInfo, pid);
+    DWORD dwCreationFlags = CREATE_NO_WINDOW;
+    dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
+    STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
+                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
+                                 (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
+                                 0, 0, 0,
+                                 STARTF_USESTDHANDLES,
+                                 0, 0, 0,
+                                 stdinChannel.pipe[0], stdoutChannel.pipe[1], stderrChannel.pipe[1]
+    };
+    success = CreateProcess(0, (wchar_t*)args.utf16(),
+                            0, 0, TRUE, dwCreationFlags,
+                            environment ? envlist.data() : 0,
+                            workingDirectory.isEmpty() ? 0 : (wchar_t*)QDir::toNativeSeparators(workingDirectory).utf16(),
+                            &startupInfo, pid);
 
     if (stdinChannel.pipe[0] != INVALID_Q_PIPE) {
         CloseHandle(stdinChannel.pipe[0]);
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index ebdac9a..1c45a58 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -95,7 +95,7 @@ bool QEglContext::chooseConfig
     do {
         // Get the number of matching configurations for this set of properties.
         EGLint matching = 0;
-        if (!eglChooseConfig(dpy, props.properties(), 0, 256, &matching) || !matching)
+        if (!eglChooseConfig(dpy, props.properties(), 0, 0, &matching) || !matching)
             continue;
 
         // If we want the best pixel format, then return the first
diff --git a/src/gui/styles/qwindowscestyle.cpp b/src/gui/styles/qwindowscestyle.cpp
index 997fc72..cd13dd8 100644
--- a/src/gui/styles/qwindowscestyle.cpp
+++ b/src/gui/styles/qwindowscestyle.cpp
@@ -1951,7 +1951,11 @@ QRect QWindowsCEStyle::subControlRect(ComplexControl control, const QStyleOption
                 rect = QRect(x, y , bs.width(), bs.height());
                 break;
           case SC_SpinBoxEditField:
-                rect = QRect(lx, fw, rx-2, spinbox->rect.height() - 2*fw);
+                if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) {
+                    rect = QRect(lx, fw, spinbox->rect.width() - 2*fw - 2, spinbox->rect.height() - 2*fw);
+                } else {
+                    rect = QRect(lx, fw, rx-2, spinbox->rect.height() - 2*fw);
+                }
                 break;
           case SC_SpinBoxFrame:
                 rect = spinbox->rect;
diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp
index c70b4c8..e708042 100644
--- a/src/gui/styles/qwindowsmobilestyle.cpp
+++ b/src/gui/styles/qwindowsmobilestyle.cpp
@@ -2984,7 +2984,11 @@ QRect QWindowsMobileStyle::subControlRect(ComplexControl control, const QStyleOp
                 rect = QRect(x + bs.width(), 0, bs.width(), bs.height());
                 break;
             case SC_SpinBoxEditField:
+                if (spinBox->buttonSymbols == QAbstractSpinBox::NoButtons) {
+                    rect = QRect(lx, fw, spinBox->rect.width() - 2*fw - 2, spinBox->rect.height() - 2*fw);
+                } else {
                     rect = QRect(lx, fw, rx-2, spinBox->rect.height() - 2*fw);
+                }
                 break;
             case SC_SpinBoxFrame:
                 rect = spinBox->rect;
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d3e295b..d7f27bd 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -106,8 +106,6 @@ SUBDIRS += \
            qdate \
            qdatetime \
            qdatetimeedit \
-           qdbuspendingcall \
-           qdbuspendingreply \
            qdebug \
            qdesktopservices \
            qdesktopwidget \
@@ -457,6 +455,8 @@ unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \
            qdbusmarshall \
            qdbusmetaobject \
            qdbusmetatype \
+           qdbuspendingcall \
+           qdbuspendingreply \
            qdbusperformance \
            qdbusreply \
            qdbusthreading \
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 1101a08..516729c 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -1373,7 +1373,9 @@ void tst_QSharedPointer::threadStressTest_data()
     QTest::newRow("5+10") << 5 << 10;
     QTest::newRow("5+30") << 5 << 30;
 
+#ifndef Q_OS_WINCE
     QTest::newRow("100+100") << 100 << 100;
+#endif
 }
 
 void tst_QSharedPointer::threadStressTest()