diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:20:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:22:47 +0200 |
| commit | 39888db8b34767974d4a443bfe40b9e84fed315a (patch) | |
| tree | 2133759c6c2e91ff65b886c70093f4f52c7bbba5 /tests/auto/quick | |
| parent | fd295c5047095806db2015a978ed593a140ff373 (diff) | |
| parent | 5c221826025276aea5ee19275f350a28e02db254 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/quick/doc/src/qmltypereference.qdoc
Change-Id: Ia58f1c5a98309c32ef8d8e5c893faf261215f19f
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index f741062d42..c5fa0e19fa 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -336,7 +336,7 @@ void tst_qquicktext::width() metricWidth = layout.boundingRect().width(); } else { QFontMetricsF fm(f); - metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width(); + metricWidth = fm.size(Qt::TextExpandTabs | Qt::TextShowMnemonic, standard.at(i)).width(); } QString componentStr = "import QtQuick 2.0\nText { text: \"" + standard.at(i) + "\" }"; |