diff options
| author | Tuomas Heimonen <tuomas.heimonen@theqtcompany.com> | 2015-05-20 14:03:17 +0300 |
|---|---|---|
| committer | Tuomas Heimonen <tuomas.heimonen@theqtcompany.com> | 2015-09-14 06:26:39 +0000 |
| commit | 9f452719f368816787e3640b84cb25f53149f15d (patch) | |
| tree | 8872e102b0938c0e4644a6b9e882d953086dff68 /tests/auto/widgets/util/qundostack/tst_qundostack.cpp | |
| parent | deb6b5032c8eed35021b3c697a770645d90b11ed (diff) | |
tst_QUndoGroup, tst_QUndoStack Fixed flag QT_NO_PROCESS
Change-Id: I6c36475e343de72c954fcc917132977eb1f8d61a
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@theqtcompany.com>
Reviewed-by: Marko Kangas <marko.kangas@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'tests/auto/widgets/util/qundostack/tst_qundostack.cpp')
| -rw-r--r-- | tests/auto/widgets/util/qundostack/tst_qundostack.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp index 29bc14f372a..2c8a9a3ee5a 100644 --- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp @@ -239,9 +239,7 @@ private slots: void macroBeginEnd(); void compression(); void undoLimit(); -#ifndef QT_NO_PROCESS void commandTextFormat(); -#endif void separateUndoText(); }; @@ -2958,9 +2956,11 @@ void tst_QUndoStack::undoLimit() true); // redoChanged } -#ifndef QT_NO_PROCESS void tst_QUndoStack::commandTextFormat() { +#ifdef QT_NO_PROCESS + QSKIP("No QProcess available"); +#else QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); if (QProcess::execute(binDir + "/lrelease -version") != 0) @@ -2999,8 +2999,8 @@ void tst_QUndoStack::commandTextFormat() QCOMPARE(redo_action->text(), QString("redo-prefix append redo-suffix")); qApp->removeTranslator(&translator); -} #endif +} void tst_QUndoStack::separateUndoText() { |