diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp index c4c2705e01..e4c14a2e10 100644 --- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp @@ -54,7 +54,6 @@ class tst_QQmlEngineDebugInspectorIntegration : public QQmlDataTest public: tst_QQmlEngineDebugInspectorIntegration() : m_process(0) - , m_connection(0) , m_inspectorClient(0) , m_engineDebugClient(0) { @@ -65,7 +64,6 @@ private: QmlDebugObjectReference findRootObject(); QQmlDebugProcess *m_process; - QQmlDebugConnection *m_connection; QQmlInspectorClient *m_inspectorClient; QQmlEngineDebugClient *m_engineDebugClient; diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index 123d7f5032..efd9ab12fe 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -1558,7 +1558,7 @@ void tst_QQuickGridView::multipleChanges(bool condensed) { QList<QPair<QString, QString> > items; for (int j=changes[i].index; j<changes[i].index + changes[i].count; ++j) - items << qMakePair(QString("new item " + j), QString::number(j)); + items << qMakePair(QString("new item %1").arg(j), QString::number(j)); model.insertItems(changes[i].index, items); break; } |