diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-15 18:22:50 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-15 18:22:50 +0000 |
| commit | eecc5fc52c919d6607e610d858c2749977a1ef75 (patch) | |
| tree | dc8c5f6621d6fbaa76bd28c1c127905444ccf50e /tests/auto/gui/text | |
| parent | 6b3845320a9242481842243f2c019aa11ce396df (diff) | |
| parent | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/text')
| -rw-r--r-- | tests/auto/gui/text/qcssparser/qcssparser.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qfontdatabase/qfontdatabase.pro | 1 | ||||
| -rw-r--r-- | tests/auto/gui/text/qzip/qzip.pro | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro index e2bb3eeea8..776b4b3de2 100644 --- a/tests/auto/gui/text/qcssparser/qcssparser.pro +++ b/tests/auto/gui/text/qcssparser/qcssparser.pro @@ -3,6 +3,8 @@ TARGET = tst_qcssparser SOURCES += tst_qcssparser.cpp QT += xml gui-private testlib +TESTDATA += testdata + requires(qtConfig(private_tests)) DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 2301655909..45cfd6f43a 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -85,7 +85,7 @@ void tst_QCssParser::scanner_data() QTest::addColumn<QString>("input"); QTest::addColumn<QString>("output"); -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(Q_OS_WINRT) QDir d(":/"); #elif !defined(Q_OS_IRIX) QDir d(SRCDIR); diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro index 0aff8a3ac8..8a08cdc182 100644 --- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro +++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro @@ -2,6 +2,7 @@ CONFIG += testcase TARGET = tst_qfontdatabase SOURCES += tst_qfontdatabase.cpp QT += testlib core-private gui-private +TESTDATA += LED_REAL.TTF android { RESOURCES += testdata.qrc diff --git a/tests/auto/gui/text/qzip/qzip.pro b/tests/auto/gui/text/qzip/qzip.pro index eb3de04da6..ee92855093 100644 --- a/tests/auto/gui/text/qzip/qzip.pro +++ b/tests/auto/gui/text/qzip/qzip.pro @@ -2,6 +2,7 @@ CONFIG += testcase TARGET = tst_qzip QT += gui-private testlib SOURCES += tst_qzip.cpp +TESTDATA += testdata android { RESOURCES += \ |