diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-08 11:55:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-15 11:39:19 +0200 |
| commit | 2c8e030a3f1c2fd75737c883edacab5773755ee5 (patch) | |
| tree | 415b38b3ab64d83c7a9e52011c5e89eb210494a3 /src/corelib/plugin/quuid.h | |
| parent | 92a1a3cc4fe8df89b37800ab8adefb36576f9edb (diff) | |
Deprecated QUuid::toString
Change-Id: I1186358df1c3f7615868725d93621608ed22ac99
Reviewed-on: http://codereview.qt.nokia.com/432
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/plugin/quuid.h')
| -rw-r--r-- | src/corelib/plugin/quuid.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 832d5bc5c6..28feff13d2 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -108,7 +108,9 @@ struct Q_CORE_EXPORT QUuid QUuid(const QString &); QUuid(const char *); QString toString() const; - operator QString() const { return toString(); } // ### Qt5 remove +#if QT_DEPRECATED_SINCE(5,0) + QT_DEPRECATED operator QString() const { return toString(); } +#endif QUuid(const QByteArray &); QByteArray toByteArray() const; #endif |