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

Conflicts:
	src/gui/inputmethod/qximinputcontext_x11.cpp

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index ebfe33adff..ef78c2ec4f 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -141,6 +141,8 @@ private slots:
     void switchReadChannels();
     void setWorkingDirectory();
     void startFinishStartFinish();
+    void invalidProgramString_data();
+    void invalidProgramString();
 
     // keep these at the end, since they use lots of processes and sometimes
     // caused obscure failures to occur in tests that followed them (esp. on the Mac)
@@ -2106,5 +2108,29 @@ void tst_QProcess::startFinishStartFinish()
     }
 }
 
+//-----------------------------------------------------------------------------
+void tst_QProcess::invalidProgramString_data()
+{
+    QTest::addColumn<QString>("programString");
+    QTest::newRow("null string") << QString();
+    QTest::newRow("empty string") << QString("");
+    QTest::newRow("only blank string") << QString("  ");
+}
+
+void tst_QProcess::invalidProgramString()
+{
+    QFETCH(QString, programString);
+    QProcess process;
+
+    qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
+    QSignalSpy spy(&process, SIGNAL(error(QProcess::ProcessError)));
+
+    process.start(programString);
+    QCOMPARE(process.error(), QProcess::FailedToStart);
+    QCOMPARE(spy.count(), 1);
+
+    QVERIFY(!QProcess::startDetached(programString));
+}
+
 QTEST_MAIN(tst_QProcess)
 #include "tst_qprocess.moc"