diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-10-20 18:44:13 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2014-10-24 16:59:26 +0200 |
| commit | 929509ea03b116588bdae38391377ec1ec976845 (patch) | |
| tree | 9387ec91867cd7eab739ac8d164a9c81ad33c553 /tests/auto/gui/text/qglyphrun | |
| parent | 8c4deff51c8064f5a15cae0342bfa66b6663662b (diff) | |
QStyleSheetStyle: Don't interfere with QFontDialog
The sample lineedit in Qt's own font dialog shouldn't have its font
affected by stylesheets.
Not only does this hampers the ability to preview the font, it actually
overrides the font selection as that one is taken directly from the
widget.
Task-number: QTBUG-41513
Change-Id: I11d0bef8c7bf7bdae4cc08b6b9276d0fc14a75fb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'tests/auto/gui/text/qglyphrun')
| -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 |
3 files changed, 5 insertions, 6 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> |