diff options
Diffstat (limited to 'tests/auto/widgets')
3 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 7e1cc77172..52cd1051ba 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -2142,6 +2142,7 @@ void tst_QApplication::qtbug_12673() QVERIFY2(!path.isEmpty(), "Cannot locate modal helper application"); path += "modal"; +#ifndef QT_NO_PROCESS QProcess testProcess; QStringList arguments; testProcess.start(path, arguments); @@ -2149,6 +2150,9 @@ void tst_QApplication::qtbug_12673() qPrintable(QString::fromLatin1("Cannot start '%1': %2").arg(path, testProcess.errorString()))); QVERIFY(testProcess.waitForFinished(20000)); QCOMPARE(testProcess.exitStatus(), QProcess::NormalExit); +#else + QSKIP( "No QProcess support", SkipAll); +#endif } class NoQuitOnHideWidget : public QWidget @@ -2222,7 +2226,9 @@ void tst_QApplication::abortQuitOnShow() executed *after* the destruction of QApplication. */ Q_GLOBAL_STATIC(QLocale, tst_qapp_locale); +#ifndef QT_NO_PROCESS Q_GLOBAL_STATIC(QProcess, tst_qapp_process); +#endif Q_GLOBAL_STATIC(QFileSystemWatcher, tst_qapp_fileSystemWatcher); #ifndef QT_NO_SHAREDMEMORY Q_GLOBAL_STATIC(QSharedMemory, tst_qapp_sharedMemory); @@ -2243,7 +2249,9 @@ void tst_QApplication::globalStaticObjectDestruction() int argc = 1; QApplication app(argc, &argv0); QVERIFY(tst_qapp_locale()); +#ifndef QT_NO_PROCESS QVERIFY(tst_qapp_process()); +#endif QVERIFY(tst_qapp_fileSystemWatcher()); #ifndef QT_NO_SHAREDMEMORY QVERIFY(tst_qapp_sharedMemory()); diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp index 17716ff130..c8a12a9866 100644 --- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp @@ -201,7 +201,9 @@ private slots: void deleteStack(); void checkSignals(); void addStackAndDie(); +#ifndef QT_NO_PROCESS void commandTextFormat(); +#endif }; tst_QUndoGroup::tst_QUndoGroup() @@ -605,6 +607,7 @@ void tst_QUndoGroup::addStackAndDie() delete stack; } +#ifndef QT_NO_PROCESS void tst_QUndoGroup::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); @@ -644,6 +647,7 @@ void tst_QUndoGroup::commandTextFormat() qApp->removeTranslator(&translator); } +#endif #else class tst_QUndoGroup : public QObject diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp index 4d47ed4f58..9b48dc7798 100644 --- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp @@ -247,7 +247,9 @@ private slots: void macroBeginEnd(); void compression(); void undoLimit(); +#ifndef QT_NO_PROCESS void commandTextFormat(); +#endif void separateUndoText(); }; @@ -2964,6 +2966,7 @@ void tst_QUndoStack::undoLimit() true); // redoChanged } +#ifndef QT_NO_PROCESS void tst_QUndoStack::commandTextFormat() { QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); @@ -3001,6 +3004,7 @@ void tst_QUndoStack::commandTextFormat() qApp->removeTranslator(&translator); } +#endif void tst_QUndoStack::separateUndoText() { |