From 929509ea03b116588bdae38391377ec1ec976845 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@digia.com>
Date: Mon, 20 Oct 2014 18:44:13 +0200
Subject: 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>
---
 tests/auto/gui/text/qglyphrun/qglyphrun.pro |   9 ++++-----
 tests/auto/gui/text/qglyphrun/test.ttf      | Bin 2008 -> 0 bytes
 tests/auto/gui/text/qglyphrun/testdata.qrc  |   2 +-
 tests/auto/gui/text/qrawfont/qrawfont.pro   |   8 ++------
 tests/auto/gui/text/qrawfont/testdata.qrc   |   2 +-
 tests/auto/gui/text/qrawfont/testfont.ttf   | Bin 63212 -> 0 bytes
 6 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 tests/auto/gui/text/qglyphrun/test.ttf
 delete mode 100644 tests/auto/gui/text/qrawfont/testfont.ttf

(limited to 'tests/auto/gui/text')

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
deleted file mode 100644
index 382b2547b0..0000000000
Binary files a/tests/auto/gui/text/qglyphrun/test.ttf and /dev/null differ
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
deleted file mode 100644
index d6042d2e58..0000000000
Binary files a/tests/auto/gui/text/qrawfont/testfont.ttf and /dev/null differ
-- 
cgit v1.2.3