diff options
-rw-r--r-- | dist/changes-5.0.0 | 5 | ||||
-rw-r--r-- | src/corelib/plugin/quuid.cpp | 9 | ||||
-rw-r--r-- | src/corelib/plugin/quuid.h | 3 |
3 files changed, 5 insertions, 12 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 3dec253f59..71aa52c79f 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -136,6 +136,11 @@ information about a particular change. QAbstractEventDispatcher::registeredTimers() will need to be updated to pass 3 arguments to the TimerInfo constructor (instead of 2). +- QUuid + + * Removed implicit conversion operator QUuid::operator QString(), instead + QUuid::toString() function should be used. + **************************************************************************** * General * **************************************************************************** diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 6fca1b6709..9f94d3bf6d 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -440,15 +440,6 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes) */ #ifndef QT_NO_QUUID_STRING /*! - \fn QUuid::operator QString() const - \obsolete - - Returns the string representation of the uuid. - - \sa toString() -*/ - -/*! Returns the string representation of this QUuid. The string is formatted as five hex fields separated by '-' and enclosed in curly braces, i.e., "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" where diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 4557199dc3..0c4f3037a7 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -108,9 +108,6 @@ struct Q_CORE_EXPORT QUuid QUuid(const QString &); QUuid(const char *); QString toString() const; -#if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED operator QString() const { return toString(); } -#endif QUuid(const QByteArray &); QByteArray toByteArray() const; #endif |