From 9f452719f368816787e3640b84cb25f53149f15d Mon Sep 17 00:00:00 2001
From: Tuomas Heimonen <tuomas.heimonen@theqtcompany.com>
Date: Wed, 20 May 2015 14:03:17 +0300
Subject: 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>
---
 tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp | 8 ++++----
 tests/auto/widgets/util/qundostack/tst_qundostack.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/auto/widgets/util')

diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index f19ef391ff..781adeedad 100644
--- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
@@ -193,9 +193,7 @@ private slots:
     void deleteStack();
     void checkSignals();
     void addStackAndDie();
-#ifndef QT_NO_PROCESS
     void commandTextFormat();
-#endif
 };
 
 tst_QUndoGroup::tst_QUndoGroup()
@@ -599,9 +597,11 @@ void tst_QUndoGroup::addStackAndDie()
     delete stack;
 }
 
-#ifndef QT_NO_PROCESS
 void tst_QUndoGroup::commandTextFormat()
 {
+#ifdef QT_NO_PROCESS
+    QSKIP("No QProcess available");
+#else
     QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
     if (QProcess::execute(binDir + "/lrelease -version") != 0)
@@ -643,8 +643,8 @@ void tst_QUndoGroup::commandTextFormat()
     QCOMPARE(redo_action->text(), QString("redo-prefix append redo-suffix"));
 
     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 29bc14f372..2c8a9a3ee5 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()
 {
-- 
cgit v1.2.3