diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-02-25 19:23:06 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-25 21:30:45 +0100 |
| commit | ffa072655df50ba0f6d21d0696750f06abf20e4c (patch) | |
| tree | e14a3f397102660ad9fc2df387b32bb50c3b8f8f /examples/itemviews | |
| parent | d91add71e79dcae45f9cac02f6d3d542afee899c (diff) | |
Fix compilation of examples with QStringBuilder
In sub-attack an interview, one can't make two implicit conversions at
once, so explicitly convert to the right type.
The change in the torrent example is required because of
https://codereview.qt-project.org/16168 (commit 9491272)
But in that case, using a QByteArray is better anyway.
Change-Id: Ieed22ac7f0d700d5ba5d1e70af3db4dd6c139c8f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'examples/itemviews')
| -rw-r--r-- | examples/itemviews/interview/model.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/itemviews/interview/model.cpp b/examples/itemviews/interview/model.cpp index 966dc7bfba..3b20f91ed6 100644 --- a/examples/itemviews/interview/model.cpp +++ b/examples/itemviews/interview/model.cpp @@ -95,7 +95,7 @@ QVariant Model::data(const QModelIndex &index, int role) const if (!index.isValid()) return QVariant(); if (role == Qt::DisplayRole) - return "Item " + QString::number(index.row()) + ":" + QString::number(index.column()); + return QVariant("Item " + QString::number(index.row()) + ":" + QString::number(index.column())); if (role == Qt::DecorationRole) { if (index.column() == 0) return iconProvider.icon(QFileIconProvider::Folder); |