summaryrefslogtreecommitdiffstats
path: root/src/sql/models/qsqlquerymodel.cpp
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-03 13:42:29 +0000
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-03 13:42:29 +0000
commit63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0 (patch)
tree7e6724964ceb6e38f478074780f06df0bdd11dbd /src/sql/models/qsqlquerymodel.cpp
parent6a89291da7e1322ad81c4939cc9d69db01957a4c (diff)
parentdc89c842779f87ce69882ba54fa8d5bb79e0edbd (diff)
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/sql/models/qsqlquerymodel.cpp')
-rw-r--r--src/sql/models/qsqlquerymodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index a72ad8c049..1719239dff 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -417,7 +417,7 @@ bool QSqlQueryModel::setHeaderData(int section, Qt::Orientation orientation,
const QVariant &value, int role)
{
Q_D(QSqlQueryModel);
- if (orientation != Qt::Horizontal || section < 0)
+ if (orientation != Qt::Horizontal || section < 0 || columnCount() <= section)
return false;
if (d->headers.size() <= section)