diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /tests/auto/widgets/util/qundostack/tst_qundostack.cpp | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
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, 6 insertions, 2 deletions
diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp index 4556816655..6e6c72db5e 100644 --- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp @@ -2974,10 +2974,14 @@ void tst_QUndoStack::commandTextFormat() if (QProcess::execute(binDir + "/lrelease -version") != 0) QSKIP("lrelease is missing or broken"); - QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/qundostack.ts")); + const QString tsFile = QFINDTESTDATA("testdata/qundostack.ts"); + QVERIFY(!tsFile.isEmpty()); + QVERIFY(!QProcess::execute(binDir + "/lrelease " + tsFile)); QTranslator translator; - QVERIFY(translator.load("testdata/qundostack.qm")); + const QString qmFile = QFINDTESTDATA("testdata/qundostack.qm"); + QVERIFY(!qmFile.isEmpty()); + QVERIFY(translator.load(qmFile)); qApp->installTranslator(&translator); QUndoStack stack; |