From 85e36faa2c677dc0bd9160538f89a2f4c71cbbe0 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Fri, 23 Nov 2012 18:21:02 +0900 Subject: Remove QUUID_STRING from qfeatures.{h,txt} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is too specific and relatively small Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf Reviewed-by: Jędrzej Nowacki --- src/corelib/plugin/quuid.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/corelib/plugin/quuid.h') 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()); @@ -204,7 +201,6 @@ public: return QUuid::createUuidV5(ns, baseData.toUtf8()); } -#endif #endif QUuid::Variant variant() const; -- cgit v1.2.3