qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence warnings from usage of deprecated APIs in tests 

Change-Id: I443705ab5ff75512393877f360468ad903df03b9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-11-09 16:51:38 +01:00
parent c3c53af394
commit 86b04bb1fa
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/quick/qquicktext/tst_qquicktext.cpp
View File

@ -3606,11 +3606,11 @@ void tst_qquicktext::fontSizeMode()
// and text is NOT wrapped // and text is NOT wrapped
myText->setVAlign(QQuickText::AlignBottom); myText->setVAlign(QQuickText::AlignBottom);
myText->setFontSizeMode(QQuickText::Fit); myText->setFontSizeMode(QQuickText::Fit);
QVERIFY(QQuickTest::qWaitForItemPolished(myText)); QVERIFY(QQuickTest::qWaitForPolish(myText));
int baselineOffset = myText->baselineOffset(); int baselineOffset = myText->baselineOffset();
myText->setHeight(myText->height() * 2); myText->setHeight(myText->height() * 2);
QVERIFY(QQuickTest::qWaitForItemPolished(myText)); QVERIFY(QQuickTest::qWaitForPolish(myText));
QVERIFY(myText->baselineOffset() > baselineOffset); QVERIFY(myText->baselineOffset() > baselineOffset);
// Growing height needs to update the baselineOffset when AlignBottom is used // Growing height needs to update the baselineOffset when AlignBottom is used
@ -3619,11 +3619,11 @@ void tst_qquicktext::fontSizeMode()
myText->setFontSizeMode(QQuickText::Fit); myText->setFontSizeMode(QQuickText::Fit);
myText->setWrapMode(QQuickText::NoWrap); myText->setWrapMode(QQuickText::NoWrap);
myText->resetMaximumLineCount(); myText->resetMaximumLineCount();
QVERIFY(QQuickTest::qWaitForItemPolished(myText)); QVERIFY(QQuickTest::qWaitForPolish(myText));
baselineOffset = myText->baselineOffset(); baselineOffset = myText->baselineOffset();
myText->setHeight(myText->height() * 2); myText->setHeight(myText->height() * 2);
QVERIFY(QQuickTest::qWaitForItemPolished(myText)); QVERIFY(QQuickTest::qWaitForPolish(myText));
QVERIFY(myText->baselineOffset() > baselineOffset); QVERIFY(myText->baselineOffset() > baselineOffset);
// Check baselineOffset for the HorizontalFit case // Check baselineOffset for the HorizontalFit case

4
tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp
View File

@ -24,6 +24,8 @@
using namespace QQuickViewTestUtils; using namespace QQuickViewTestUtils;
using namespace QQuickVisualTestUtils; using namespace QQuickVisualTestUtils;
using namespace Qt::StringLiterals;
#define LOAD_TREEVIEW(fileName) \ #define LOAD_TREEVIEW(fileName) \
view->setSource(testFileUrl(fileName)); \ view->setSource(testFileUrl(fileName)); \
view->show(); \ view->show(); \
@ -1111,7 +1113,7 @@ void tst_qquicktreeview::sortTreeModelDynamic()
// Now change the text in one of the items. This will trigger // Now change the text in one of the items. This will trigger
// a sort for only one of the parents in the model. // a sort for only one of the parents in the model.
proxyModel.setData(treeView->modelIndex(0, row), u"xxx"_qs, Qt::DisplayRole); proxyModel.setData(treeView->modelIndex(0, row), u"xxx"_s, Qt::DisplayRole);
for (int row = 0; row < treeView->rows(); ++row) { for (int row = 0; row < treeView->rows(); ++row) {
const auto index = treeView->modelIndex(0, row); const auto index = treeView->modelIndex(0, row);