diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 18:21:02 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-05 11:35:16 +0100 |
| commit | 85e36faa2c677dc0bd9160538f89a2f4c71cbbe0 (patch) | |
| tree | 869a0a2326bdf9d4656163bf668d289dbc94c1e4 /src/corelib/plugin/quuid.h | |
| parent | 73969155416d8bcf9236b87d8d48ba8abf5b09e5 (diff) | |
Remove QUUID_STRING from qfeatures.{h,txt}
It is too specific and relatively small
Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/plugin/quuid.h')
| -rw-r--r-- | src/corelib/plugin/quuid.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index ba475ac33b..d1b56002f3 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -115,13 +115,11 @@ public: } #endif -#ifndef QT_NO_QUUID_STRING QUuid(const QString &); QUuid(const char *); QString toString() const; QUuid(const QByteArray &); QByteArray toByteArray() const; -#endif QByteArray toRfc4122() const; static QUuid fromRfc4122(const QByteArray &); bool isNull() const; @@ -193,7 +191,6 @@ public: #ifndef QT_BOOTSTRAPPED static QUuid createUuidV3(const QUuid &ns, const QByteArray &baseData); static QUuid createUuidV5(const QUuid &ns, const QByteArray &baseData); -#ifndef QT_NO_QUUID_STRING static inline QUuid createUuidV3(const QUuid &ns, const QString &baseData) { return QUuid::createUuidV3(ns, baseData.toUtf8()); @@ -205,7 +202,6 @@ public: } #endif -#endif QUuid::Variant variant() const; QUuid::Version version() const; |