Removed obsolete function QUuid::operator QString()
It is a source incompatible change, but I believe it is safe to say that it is a small change, which doesn't affect many people. Change-Id: Iad11befe4cca60484cf4e04cd3049c93a4ea5faf Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
parent
b237c6683b
commit
b0cf81684d
5
dist/changes-5.0.0
vendored
5
dist/changes-5.0.0
vendored
@ -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 *
|
||||
****************************************************************************
|
||||
|
@ -439,15 +439,6 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
|
||||
otherwise returns false.
|
||||
*/
|
||||
#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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user