From 2c8e030a3f1c2fd75737c883edacab5773755ee5 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 8 Jun 2011 11:55:40 +0200 Subject: [PATCH] Deprecated QUuid::toString Change-Id: I1186358df1c3f7615868725d93621608ed22ac99 Reviewed-on: http://codereview.qt.nokia.com/432 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/corelib/plugin/quuid.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 832d5bc..28feff1 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 -- 2.7.4