removed obsolete function QUuid::operator QString()

upstream commits:
https://github.com/qtproject/qtbase/commit/b0cf81684dd834d238b0233412fbfebd24fc5e27

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/plugin/quuid.cpp b/src/core/plugin/quuid.cpp
index 6d4aa96..34d116b 100644 (file)
--- a/src/core/plugin/quuid.cpp
+++ b/src/core/plugin/quuid.cpp
@@ -440,14 +440,6 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
 */
 #ifndef QT_NO_QUUID_STRING
 /*!
-    \fn QUuid::operator QString() const
-
-    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/core/plugin/quuid.h b/src/core/plugin/quuid.h
index f899fbe..59af1bf 100644 (file)
--- a/src/core/plugin/quuid.h
+++ b/src/core/plugin/quuid.h
@@ -107,7 +107,6 @@ struct Q_CORE_EXPORT QUuid
     QUuid(const QString &);
     QUuid(const char *);
     QString toString() const;
-    operator QString() const { return toString(); } // ### Qt5 remove
     QUuid(const QByteArray &);
     QByteArray toByteArray() const;
 #endif