From efd8e6922c59f6f9240b01e4e620fb464d11fc78 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 18 Nov 2015 09:58:34 +0100
Subject: [PATCH] QSqlQueryModel::clear(): Call begin/endResetModel().

Call begin/endResetModel() in QSqlQueryModel and all
derived classes.

Task-number: QTBUG-49404
Change-Id: I11492d6386efb4c945c246a6379aaa6ca4502a25
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
---
 src/sql/models/qsqlquerymodel.cpp                   |  2 ++
 src/sql/models/qsqlrelationaltablemodel.cpp         |  2 ++
 src/sql/models/qsqltablemodel.cpp                   |  2 ++
 .../models/qsqlquerymodel/tst_qsqlquerymodel.cpp    | 13 +++++++++++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index 3faea11c705..5a1958708aa 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -471,6 +471,7 @@ void QSqlQueryModel::setQuery(const QString &query, const QSqlDatabase &db)
 void QSqlQueryModel::clear()
 {
     Q_D(QSqlQueryModel);
+    beginResetModel();
     d->error = QSqlError();
     d->atEnd = true;
     d->query.clear();
@@ -478,6 +479,7 @@ void QSqlQueryModel::clear()
     d->colOffsets.clear();
     d->bottom = QModelIndex();
     d->headers.clear();
+    endResetModel();
 }
 
 /*!
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 42acf6a73bc..ac2d270fc84 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -652,9 +652,11 @@ void QSqlRelationalTableModel::revertRow(int row)
 void QSqlRelationalTableModel::clear()
 {
     Q_D(QSqlRelationalTableModel);
+    beginResetModel();
     d->clearChanges();
     d->relations.clear();
     QSqlTableModel::clear();
+    endResetModel();
 }
 
 
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index b0d3e6df9d4..740c1b9b5db 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -1262,8 +1262,10 @@ void QSqlTableModel::setFilter(const QString &filter)
 void QSqlTableModel::clear()
 {
     Q_D(QSqlTableModel);
+    beginResetModel();
     d->clear();
     QSqlQueryModel::clear();
+    endResetModel();
 }
 
 /*! \reimp
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index ae2f8dde5f0..52baa0070be 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -593,7 +593,7 @@ public:
         connect(this, SIGNAL(modelReset()), this, SLOT(modelResetSlot()));
     }
 
-    void testme()
+    void testNested()
     {
         // Only the outermost beginResetModel/endResetModel should
         // emit signals.
@@ -618,6 +618,14 @@ public:
         QCOMPARE(gotReset, true);
     }
 
+    void testClear() // QTBUG-49404: Basic test whether clear() emits signals.
+    {
+        gotAboutToBeReset = gotReset = false;
+        clear();
+        QVERIFY(gotAboutToBeReset);
+        QVERIFY(gotReset);
+    }
+
 private slots:
     void modelAboutToBeResetSlot() { gotAboutToBeReset = true; }
     void modelResetSlot() { gotReset = true; }
@@ -634,7 +642,8 @@ void tst_QSqlQueryModel::nestedResets()
     CHECK_DATABASE(db);
 
     NestedResetsTest t;
-    t.testme();
+    t.testClear();
+    t.testNested();
 }
 
 // For task 180617