diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/sql | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/sql')
| -rw-r--r-- | examples/sql/drilldown/imageitem.cpp | 5 | ||||
| -rw-r--r-- | examples/sql/querymodel/customsqlmodel.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/sql/drilldown/imageitem.cpp b/examples/sql/drilldown/imageitem.cpp index 04ec614755..72de623373 100644 --- a/examples/sql/drilldown/imageitem.cpp +++ b/examples/sql/drilldown/imageitem.cpp @@ -109,9 +109,8 @@ void ImageItem::setFrame(int frame) //! [4] void ImageItem::adjust() { - QMatrix matrix; - matrix.scale(120/ boundingRect().width(), 120/ boundingRect().height()); - setMatrix(matrix); + setTransform(QTransform::fromScale(120 / boundingRect().width(), + 120 / boundingRect().height())); } //! [4] diff --git a/examples/sql/querymodel/customsqlmodel.cpp b/examples/sql/querymodel/customsqlmodel.cpp index 21bedee727..7be0a65882 100644 --- a/examples/sql/querymodel/customsqlmodel.cpp +++ b/examples/sql/querymodel/customsqlmodel.cpp @@ -67,7 +67,7 @@ QVariant CustomSqlModel::data(const QModelIndex &index, int role) const else if (index.column() == 2) return value.toString().toUpper(); } - if (role == Qt::TextColorRole && index.column() == 1) + if (role == Qt::ForegroundRole && index.column() == 1) return QVariant::fromValue(QColor(Qt::blue)); return value; } |