diff options
author | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-12-07 12:39:56 (GMT) |
---|---|---|
committer | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-12-07 12:39:56 (GMT) |
commit | ec31c6e5294285d0dc8e96d30d1300cfd1b0e96a (patch) | |
tree | 31f67bb4bbbfe2ed01ade9676b071450908161d9 /src/sql/drivers | |
parent | 8a390046adddb8df3ddcf3a421f6f547e6cfe7aa (diff) | |
download | Qt-ec31c6e5294285d0dc8e96d30d1300cfd1b0e96a.zip Qt-ec31c6e5294285d0dc8e96d30d1300cfd1b0e96a.tar.gz Qt-ec31c6e5294285d0dc8e96d30d1300cfd1b0e96a.tar.bz2 |
Revert "Fix sqlite driver memory eating due to close failure"
Introduced a problem for the SDK (QTBUG-23036).
This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.
Diffstat (limited to 'src/sql/drivers')
-rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 38e4a63..8294a55 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -104,7 +104,6 @@ class QSQLiteDriverPrivate public: inline QSQLiteDriverPrivate() : access(0) {} sqlite3 *access; - QList <QSQLiteResult *> results; }; @@ -287,12 +286,10 @@ QSQLiteResult::QSQLiteResult(const QSQLiteDriver* db) { d = new QSQLiteResultPrivate(this); d->access = db->d->access; - db->d->results.append(this); } QSQLiteResult::~QSQLiteResult() { - qobject_cast<const QSQLiteDriver *>(driver())->d->results.removeOne(this); d->cleanup(); delete d; } @@ -556,10 +553,6 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c void QSQLiteDriver::close() { if (isOpen()) { - foreach (QSQLiteResult *result, d->results) { - result->d->finalize(); - } - if (sqlite3_close(d->access) != SQLITE_OK) setLastError(qMakeError(d->access, tr("Error closing database"), QSqlError::ConnectionError)); |