Merge "Merge branch 'stable' into dev" into refs/staging/dev

2 files changed, 0 insertions, 3 deletions

diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index 194c0a94a0..8d4631f3cc 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -124,7 +124,6 @@ tst_QSqlQueryModel::~tst_QSqlQueryModel()
 
 void tst_QSqlQueryModel::initTestCase()
 {
-    qRegisterMetaType<QModelIndex>("QModelIndex");
     dbs.open();
     for (QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it) {
 	QSqlDatabase db = QSqlDatabase::database((*it));
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index b6a0a7b1fa..a3341fff24 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -49,7 +49,6 @@ const QString test(qTableName("test", __FILE__)),
                    test2(qTableName("test2", __FILE__)),
                    test3(qTableName("test3", __FILE__));
 
-Q_DECLARE_METATYPE(QModelIndex)
 
 class tst_QSqlTableModel : public QObject
 {
@@ -152,7 +151,6 @@ private:
 
 tst_QSqlTableModel::tst_QSqlTableModel()
 {
-    qRegisterMetaType<QModelIndex>("QModelIndex");
     dbs.open();
 }