diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:12:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:12:21 +0200 |
| commit | 794781e7cff9f7d44af64292796428478ed18663 (patch) | |
| tree | dae1f8478885d95dac5766ce46d5dd4784ca06f4 /src/sql | |
| parent | f69d32b535d456a2441754ef5733c7fb65411d6c (diff) | |
| parent | e83f1900f657a41036bd16e917527fcb7a52fd2b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_mouse.mm
src/testlib/testlib.pro
Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsqlresult.cpp | 6 | ||||
| -rw-r--r-- | src/sql/kernel/qsqlresult_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index cdb1379502..915a980bf0 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -690,7 +690,7 @@ void QSqlResult::bindValue(int index, const QVariant& val, QSql::ParamType param { Q_D(QSqlResult); d->binds = PositionalBinding; - QList<int>& indexes = d->indexes[d->fieldSerial(index)]; + QVector<int> &indexes = d->indexes[d->fieldSerial(index)]; if (!indexes.contains(index)) indexes.append(index); if (d->values.count() <= index) @@ -717,7 +717,7 @@ void QSqlResult::bindValue(const QString& placeholder, const QVariant& val, d->binds = NamedBinding; // if the index has already been set when doing emulated named // bindings - don't reset it - const QList<int> indexes = d->indexes.value(placeholder); + const QVector<int> indexes = d->indexes.value(placeholder); for (int idx : indexes) { if (d->values.count() <= idx) d->values.resize(idx + 1); @@ -764,7 +764,7 @@ QVariant QSqlResult::boundValue(int index) const QVariant QSqlResult::boundValue(const QString& placeholder) const { Q_D(const QSqlResult); - QList<int> indexes = d->indexes.value(placeholder); + const QVector<int> indexes = d->indexes.value(placeholder); return d->values.value(indexes.value(0,-1)); } diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h index 7b312800c1..f0816a7fb5 100644 --- a/src/sql/kernel/qsqlresult_p.h +++ b/src/sql/kernel/qsqlresult_p.h @@ -135,7 +135,7 @@ public: QString executedQuery; QHash<int, QSql::ParamType> types; QVector<QVariant> values; - typedef QHash<QString, QList<int> > IndexMap; + typedef QHash<QString, QVector<int> > IndexMap; IndexMap indexes; typedef QVector<QHolder> QHolderVector; |