removed obsolete function QUuid::operator QString()

upstream commits:
b0cf81684d

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-05-28 01:53:50 +00:00
parent f2f58824a1
commit c076cd7612
2 changed files with 0 additions and 9 deletions

View file

@ -439,14 +439,6 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
otherwise returns false. otherwise returns false.
*/ */
#ifndef QT_NO_QUUID_STRING #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 Returns the string representation of this QUuid. The string is
formatted as five hex fields separated by '-' and enclosed in formatted as five hex fields separated by '-' and enclosed in

View file

@ -107,7 +107,6 @@ struct Q_CORE_EXPORT QUuid
QUuid(const QString &); QUuid(const QString &);
QUuid(const char *); QUuid(const char *);
QString toString() const; QString toString() const;
operator QString() const { return toString(); } // ### Qt5 remove
QUuid(const QByteArray &); QUuid(const QByteArray &);
QByteArray toByteArray() const; QByteArray toByteArray() const;
#endif #endif