diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
| commit | 980567b3a32b2e2f00c86f2d627cd82b5230dd0f (patch) | |
| tree | bc8cc4005b2e07cbc5cad8ba30f8c9fa4f236c3d /tests/auto/widgets/styles/qstylesheetstyle | |
| parent | e81acde7d0cf5fb44a3fb2cf0bf7aaa2c65f807e (diff) | |
| parent | 730cbad8824bcfcb7ab60371a6563cfb6dd5658d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/android/templates/AndroidManifest.xml
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9
Diffstat (limited to 'tests/auto/widgets/styles/qstylesheetstyle')
| -rw-r--r-- | tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 8f1f8590cb..61b1fed1f8 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -741,9 +741,9 @@ void tst_QStyleSheetStyle::fontPropagation() QCOMPARE(FONTSIZE(pb), 20); QWidget window; - window.setStyleSheet("* { font-size: 10pt }"); + window.setStyleSheet("* { font-size: 9pt }"); pb.setParent(&window); - QCOMPARE(FONTSIZE(pb), 10); + QCOMPARE(FONTSIZE(pb), 9); window.setStyleSheet(QString()); QCOMPARE(FONTSIZE(pb), buttonFontSize); |