AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QUndoGroup, tst_QUndoStack Fixed flag QT_NO_PROCESS

Browse Source 
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>
This commit is contained in:
Tuomas Heimonen 2015-05-20 14:03:17 +03:00
parent deb6b5032c
commit 9f452719f3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
View File

@ -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

8
tests/auto/widgets/util/qundostack/tst_qundostack.cpp
View File

@ -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()
{