diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-29 13:45:39 (GMT) |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-29 13:45:39 (GMT) |
commit | 07c2b17276057a8b47c3be57ab7c2cf66dac0edd (patch) | |
tree | 48128509f60ff6d8a4bd129ccb3f29481529095a /tests/auto/qapplication/tst_qapplication.cpp | |
parent | 80bd3a13ee6f42a39d3d3c2985a648e2229778f6 (diff) | |
parent | 928eb3dee17f43d54262d1f3dfc5212f183e6ce9 (diff) | |
download | Qt-07c2b17276057a8b47c3be57ab7c2cf66dac0edd.zip Qt-07c2b17276057a8b47c3be57ab7c2cf66dac0edd.tar.gz Qt-07c2b17276057a8b47c3be57ab7c2cf66dac0edd.tar.bz2 |
Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects
Conflicts:
src/gui/graphicsview/qgraphicseffect.cpp
src/gui/graphicsview/qgraphicseffect_p.h
Diffstat (limited to 'tests/auto/qapplication/tst_qapplication.cpp')
-rw-r--r-- | tests/auto/qapplication/tst_qapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp index 8532723..7cb6bfa 100644 --- a/tests/auto/qapplication/tst_qapplication.cpp +++ b/tests/auto/qapplication/tst_qapplication.cpp @@ -1382,6 +1382,7 @@ void tst_QApplication::testDeleteLaterProcessEvents() */ void tst_QApplication::desktopSettingsAware() { +#ifndef QT_NO_PROCESS QProcess testProcess; #ifdef Q_OS_WINCE int argc = 0; @@ -1399,6 +1400,7 @@ void tst_QApplication::desktopSettingsAware() QVERIFY(testProcess.waitForFinished(10000)); QCOMPARE(int(testProcess.state()), int(QProcess::NotRunning)); QVERIFY(int(testProcess.error()) != int(QProcess::Crashed)); +#endif } void tst_QApplication::setActiveWindow() |