diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-23 07:13:00 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-23 07:13:00 +0100 |
commit | 1ed7a67a4cef8350103e4ea33b4bbd084f5d4c2d (patch) | |
tree | 03dd7b6f8d9ccc02da6d0d882793ec62c71b00f7 /src/sql | |
parent | dbb7817e13bc7f7ccb8f04b00a65eb3dcf8d25f8 (diff) | |
parent | 6a2b17eeec2d171d2afa17bdbc36456346bfd13b (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/kernel/qcoreapplication.cpp
src/corelib/thread/qthread_unix.cpp
Change-Id: Ia08d613c3f0bd08cb6dc3e3a57257207dfd4a099
Diffstat (limited to 'src/sql')
-rw-r--r-- | src/sql/models/qsqlquerymodel.cpp | 2 | ||||
-rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.cpp | 2 | ||||
-rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp index 3faea11c70..5a1958708a 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 42acf6a73b..ac2d270fc8 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 b0d3e6df9d..740c1b9b5d 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 |