diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 09:37:12 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 16:05:32 +0000 |
| commit | aa40680f66542c29742c8775982a549b1717e357 (patch) | |
| tree | a92ce67c598aaa1353780de03a777b72cc882afe /tests | |
| parent | 352aeb96a52590aff91e3f6a1e03c65418d596d3 (diff) | |
| download | qtquickcontrols-aa40680f66542c29742c8775982a549b1717e357.tar.gz | |
Fix deprecation warnings
Private/qquicktreemodeladaptor.cpp:744:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations]
Private/qquicktreemodeladaptor.cpp:750:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations]
Private/qquickstyleitem.cpp:922:89: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
In file included from /data1/frkleint/qt-513/qtbase/include/QtGui/qfontmetrics.h:1:0,
Private/qquickstyleitem.cpp:942:60: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
Private/qquickstyleitem.cpp:961:75: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
Private/qquickstyleitem.cpp:1010:52: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
Private/qquickstyleitem.cpp:1010:86: warning: ‘int QFontMetrics::width(QChar) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
Private/qquickstyleitem.cpp:1469:46: warning: ‘static bool QPixmapCache::find(const QString&, QPixmap&)’ is deprecated: Use bool find(const QString &, QPixmap *) instead [-Wdeprecated-declarations]
../../../src/controls/Private/qquicktreemodeladaptor.cpp:744:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations]/data1/frkleint/qt-513/qtbase/include/QtCore/../../src/corelib/tools/qlist.h:227:10: note: declared here
../../../src/controls/Private/qquicktreemodeladaptor.cpp:750:52: warning: ‘void QList<T>::swap(int, int) [with T = QQuickTreeModelAdaptor1::TreeItem]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations]
tst_qquicktreemodeladaptor.cpp:1387:39: warning: ‘QModelIndex QModelIndex::child(int, int) const’ is deprecated: Use QAbstractItemModel::index [-Wdeprecated-declarations]
Change-Id: I213d7ffd2cb329b542f9273e3a566a813d1cc24f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp index 96659a2c..0fec548d 100644 --- a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp +++ b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp @@ -1384,7 +1384,7 @@ void tst_QQuickTreeModelAdaptor::hasChildrenEmit() QModelIndex root = model.index(0,0); QVERIFY(root.isValid()); - QModelIndex child = root.child(0,0); + QModelIndex child = model.index(0, 0, root); QVERIFY(child.isValid()); // Root not expanded , child not expanded, insert in child, expect no datachanged |