diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-15 03:03:56 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-19 08:38:39 +0000 |
| commit | dbcee395e5cf54c0c0f961a80c4e9959d564604d (patch) | |
| tree | bcd09d745823ec6849c39cbeb8440d6c9345b0d3 /examples | |
| parent | 9bdcac03796c48614f2c79b5970aff8b37be7811 (diff) | |
Use | to OR some related flags
And not +. Guess what, this was "accidentally" working around
a number of bugs, most importantly QTBUG-75172 (which is caused by
QTBUG-74639 and probably others).
Change-Id: If13810d9408f2be7b87f0d259737bff8cacc6f7b
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: David Faure <david.faure@kdab.com>
(cherry picked from commit 97af1b839c04dbd83b5ba5bec138dd4718d4491a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/tutorials/modelview/2_formatting/mymodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/tutorials/modelview/2_formatting/mymodel.cpp b/examples/widgets/tutorials/modelview/2_formatting/mymodel.cpp index 938597a34e..5ddde156ae 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/mymodel.cpp +++ b/examples/widgets/tutorials/modelview/2_formatting/mymodel.cpp @@ -100,7 +100,7 @@ QVariant MyModel::data(const QModelIndex &index, int role) const break; case Qt::TextAlignmentRole: if (row == 1 && col == 1) //change text alignment only for cell(1,1) - return Qt::AlignRight + Qt::AlignVCenter; + return int(Qt::AlignRight | Qt::AlignVCenter); break; case Qt::CheckStateRole: if (row == 1 && col == 0) //add a checkbox to cell(1,0) |