diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-24 21:10:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-24 22:37:52 +0200 |
| commit | a1d2bf257e5240aadcd0d3b95f04ee2c86925b88 (patch) | |
| tree | 874e4cc617fdae7e558a1ee653b9e2fbf3df1ad2 /tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | |
| parent | 223f5c0273452b1ccd48b6f1057598f507a1b2b9 (diff) | |
| parent | abd3b8030cbcc50379578b88ce6019e338ff8597 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/text/qcssparser/tst_qcssparser.cpp')
| -rw-r--r-- | tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 86e282fad2..719ca5a0a7 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -130,7 +130,9 @@ void tst_QCssParser::scanner_data() QTest::addColumn<QString>("input"); QTest::addColumn<QString>("output"); -#if !defined(Q_OS_IRIX) && !defined(Q_OS_WINCE) +#if defined(Q_OS_ANDROID) + QDir d(":/"); +#elif !defined(Q_OS_IRIX) && !defined(Q_OS_WINCE) QDir d(SRCDIR); #else QDir d(QDir::current()); |