diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
| commit | d0fcaa7eaaae85ddbf0a78efa59b341380c101a4 (patch) | |
| tree | 9b3422ae33ef9dfcda0af228c56c3d2eeed7b0c3 /src/corelib/kernel/qvariant.cpp | |
| parent | f6ce2d42b3cbe049ebcf1a2349a5cd4dde2c6d24 (diff) | |
| parent | 5e64957ee4162ecf4456306a530a68761c2b127f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/widgets/util/qcompleter.cpp
Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 4d1aa911f7..0b4c3f387f 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -468,7 +468,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) case QVariant::Double: *str = QString::number(d->data.d, 'g', QLocale::FloatingPointShortest); break; -#if !defined(QT_NO_DATESTRING) +#if QT_CONFIG(datestring) case QVariant::Date: *str = v_cast<QDate>(d)->toString(Qt::ISODate); break; @@ -617,7 +617,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) QDate *dt = static_cast<QDate *>(result); if (d->type == QVariant::DateTime) *dt = v_cast<QDateTime>(d)->date(); -#ifndef QT_NO_DATESTRING +#if QT_CONFIG(datestring) else if (d->type == QVariant::String) *dt = QDate::fromString(*v_cast<QString>(d), Qt::ISODate); #endif @@ -632,7 +632,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) case QVariant::DateTime: *t = v_cast<QDateTime>(d)->time(); break; -#ifndef QT_NO_DATESTRING +#if QT_CONFIG(datestring) case QVariant::String: *t = QTime::fromString(*v_cast<QString>(d), Qt::ISODate); break; @@ -645,7 +645,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) case QVariant::DateTime: { QDateTime *dt = static_cast<QDateTime *>(result); switch (d->type) { -#ifndef QT_NO_DATESTRING +#if QT_CONFIG(datestring) case QVariant::String: *dt = QDateTime::fromString(*v_cast<QString>(d), Qt::ISODate); break; |