diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
commit | 2eb26c170920d28213b71e549d5dac4663febb14 (patch) | |
tree | 8df5223ac114d758c2112a8fc787992175556418 /tests/auto/gui/text | |
parent | 49ddae28e0dcd1c59dd5d742cffedd5290d1224a (diff) | |
parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/gui/text/qfontdatabase.cpp
Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
Diffstat (limited to 'tests/auto/gui/text')
-rw-r--r-- | tests/auto/gui/text/qglyphrun/qglyphrun.pro | 9 | ||||
-rw-r--r-- | tests/auto/gui/text/qglyphrun/test.ttf | bin | 2008 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/text/qglyphrun/testdata.qrc | 2 | ||||
-rw-r--r-- | tests/auto/gui/text/qrawfont/qrawfont.pro | 8 | ||||
-rw-r--r-- | tests/auto/gui/text/qrawfont/testdata.qrc | 2 | ||||
-rw-r--r-- | tests/auto/gui/text/qrawfont/testfont.ttf | bin | 63212 -> 0 bytes |
6 files changed, 8 insertions, 13 deletions
diff --git a/tests/auto/gui/text/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro index 0993a5c49c..b7d9f164c9 100644 --- a/tests/auto/gui/text/qglyphrun/qglyphrun.pro +++ b/tests/auto/gui/text/qglyphrun/qglyphrun.pro @@ -8,14 +8,13 @@ linux: CONFIG += insignificant_test SOURCES += \ tst_qglyphrun.cpp -android { - RESOURCES += \ - testdata.qrc -} wince* { additionalFiles.files = test.ttf - additionalFiles.path = . + additionalFiles.path = ../../../shared/resources/ DEPLOYMENT += additionalFiles +} else { + RESOURCES += \ + testdata.qrc } diff --git a/tests/auto/gui/text/qglyphrun/test.ttf b/tests/auto/gui/text/qglyphrun/test.ttf Binary files differdeleted file mode 100644 index 382b2547b0..0000000000 --- a/tests/auto/gui/text/qglyphrun/test.ttf +++ /dev/null diff --git a/tests/auto/gui/text/qglyphrun/testdata.qrc b/tests/auto/gui/text/qglyphrun/testdata.qrc index c4e237ad2f..25cadc477e 100644 --- a/tests/auto/gui/text/qglyphrun/testdata.qrc +++ b/tests/auto/gui/text/qglyphrun/testdata.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/"> - <file>test.ttf</file> + <file alias="test.ttf">../../../shared/resources/test.ttf</file> </qresource> </RCC> diff --git a/tests/auto/gui/text/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro index 1891e7a9bf..20da2e9a22 100644 --- a/tests/auto/gui/text/qrawfont/qrawfont.pro +++ b/tests/auto/gui/text/qrawfont/qrawfont.pro @@ -7,9 +7,5 @@ QT = core core-private gui gui-private testlib SOURCES += \ tst_qrawfont.cpp -TESTDATA += testfont_bold_italic.ttf testfont.ttf - -android { - RESOURCES += \ - testdata.qrc -} +RESOURCES += \ + testdata.qrc diff --git a/tests/auto/gui/text/qrawfont/testdata.qrc b/tests/auto/gui/text/qrawfont/testdata.qrc index 7bea0d5a39..8f8e32ed24 100644 --- a/tests/auto/gui/text/qrawfont/testdata.qrc +++ b/tests/auto/gui/text/qrawfont/testdata.qrc @@ -1,6 +1,6 @@ <RCC> <qresource prefix="/"> <file>testfont_bold_italic.ttf</file> - <file>testfont.ttf</file> + <file alias="testfont.ttf">../../../shared/resources/testfont.ttf</file> </qresource> </RCC> diff --git a/tests/auto/gui/text/qrawfont/testfont.ttf b/tests/auto/gui/text/qrawfont/testfont.ttf Binary files differdeleted file mode 100644 index d6042d2e58..0000000000 --- a/tests/auto/gui/text/qrawfont/testfont.ttf +++ /dev/null |