diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-12 20:19:50 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-12 21:33:55 +0000 |
| commit | dde8c6f77e052e7f05176c38b7559cc67ab42336 (patch) | |
| tree | a91d634df4f7f08982fafe69fdc3d7cf5873a392 /src/corelib | |
| parent | 12f684ed5faed6c6bdbd82ab68bc10e09f8afc1a (diff) | |
QVariant: Fix wrong return type in toPersistentModelIndex()
Change-Id: I53afa712d38ec6a41fce77474acccf9c587ea6a8
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 9ae6c779c0..f7a4abbf68 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2536,7 +2536,7 @@ QModelIndex QVariant::toModelIndex() const \sa canConvert(), convert(), toModelIndex() */ -QModelIndex QVariant::toPersistentModelIndex() const +QPersistentModelIndex QVariant::toPersistentModelIndex() const { return qVariantToHelper<QPersistentModelIndex>(d, handlerManager); } diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index d9eca94391..58dfc3aab0 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -320,7 +320,7 @@ class Q_CORE_EXPORT QVariant QEasingCurve toEasingCurve() const; QUuid toUuid() const; QModelIndex toModelIndex() const; - QModelIndex toPersistentModelIndex() const; + QPersistentModelIndex toPersistentModelIndex() const; QJsonValue toJsonValue() const; QJsonObject toJsonObject() const; QJsonArray toJsonArray() const; |