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/kernel | |
| 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/kernel')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 9ff9d10bf0..26deeba6a2 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -341,11 +341,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) *str = v_cast<QUrl>(d)->toString(); break; #endif -#ifndef QT_NO_QUUID_STRING case QVariant::Uuid: *str = v_cast<QUuid>(d)->toString(); break; -#endif default: return false; } @@ -722,11 +720,9 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) #endif case QVariant::Uuid: switch (d->type) { -#ifndef QT_NO_QUUID_STRING case QVariant::String: *static_cast<QUuid *>(result) = QUuid(*v_cast<QString>(d)); break; -#endif default: return false; } |