diff options
author | David Faure <faure@kde.org> | 2012-08-19 10:01:06 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 22:16:33 (GMT) |
commit | 1cc7a13c71240507a5c6aa31fdf63e2db30d4117 (patch) | |
tree | f96c53574530d4d1332eda8c38849c1504661f62 /src/corelib | |
parent | cfd16f886a29d07b680be436148de52177558436 (diff) | |
download | Qt-1cc7a13c71240507a5c6aa31fdf63e2db30d4117.zip Qt-1cc7a13c71240507a5c6aa31fdf63e2db30d4117.tar.gz Qt-1cc7a13c71240507a5c6aa31fdf63e2db30d4117.tar.bz2 |
Remove qurl.cpp from qmake and bootstrap, it's not needed.
(and I need this out to be able to use QMutex in QUrl)
Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/qvariant.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 3ff8cde..d591350 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -136,9 +136,11 @@ static void construct(QVariant::Private *x, const void *copy) v_construct<QPointF>(x, copy); break; #endif +#ifndef QT_BOOTSTRAPPED case QVariant::Url: v_construct<QUrl>(x, copy); break; +#endif case QVariant::Locale: v_construct<QLocale>(x, copy); break; @@ -254,9 +256,11 @@ static void clear(QVariant::Private *d) v_clear<QRectF>(d); break; #endif +#ifndef QT_BOOTSTRAPPED case QVariant::Url: v_clear<QUrl>(d); break; +#endif case QVariant::Locale: v_clear<QLocale>(d); break; @@ -330,8 +334,8 @@ static bool isNull(const QVariant::Private *d) #endif #ifndef QT_BOOTSTRAPPED case QVariant::EasingCurve: -#endif case QVariant::Url: +#endif case QVariant::Locale: case QVariant::RegExp: case QVariant::StringList: @@ -419,8 +423,10 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b) case QVariant::PointF: return *v_cast<QPointF>(a) == *v_cast<QPointF>(b); #endif +#ifndef QT_BOOTSTRAPPED case QVariant::Url: return *v_cast<QUrl>(a) == *v_cast<QUrl>(b); +#endif case QVariant::Locale: return *v_cast<QLocale>(a) == *v_cast<QLocale>(b); #ifndef QT_NO_REGEXP @@ -625,6 +631,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, ok = &dummy; switch (uint(t)) { +#ifndef QT_BOOTSTRAPPED case QVariant::Url: switch (d->type) { case QVariant::String: @@ -634,6 +641,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, return false; } break; +#endif case QVariant::String: { QString *str = static_cast<QString *>(result); switch (d->type) { @@ -683,9 +691,11 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, if (v_cast<QStringList>(d)->count() == 1) *str = v_cast<QStringList>(d)->at(0); break; +#ifndef QT_BOOTSTRAPPED case QVariant::Url: *str = v_cast<QUrl>(d)->toString(); break; +#endif default: return false; } @@ -1119,9 +1129,11 @@ static void streamDebug(QDebug dbg, const QVariant &v) case QVariant::ByteArray: dbg.nospace() << v.toByteArray(); break; +#ifndef QT_BOOTSTRAPPED case QVariant::Url: dbg.nospace() << v.toUrl(); break; +#endif #ifndef QT_NO_GEOM_VARIANT case QVariant::Point: dbg.nospace() << v.toPoint(); @@ -1728,7 +1740,9 @@ QVariant::QVariant(const QRect &r) { d.is_null = false; d.type = Rect; v_constru QVariant::QVariant(const QSize &s) { d.is_null = false; d.type = Size; v_construct<QSize>(&d, s); } QVariant::QVariant(const QSizeF &s) { d.is_null = false; d.type = SizeF; v_construct<QSizeF>(&d, s); } #endif +#ifndef QT_BOOTSTRAPPED QVariant::QVariant(const QUrl &u) { d.is_null = false; d.type = Url; v_construct<QUrl>(&d, u); } +#endif QVariant::QVariant(const QLocale &l) { d.is_null = false; d.type = Locale; v_construct<QLocale>(&d, l); } #ifndef QT_NO_REGEXP QVariant::QVariant(const QRegExp ®Exp) { d.is_null = false; d.type = RegExp; v_construct<QRegExp>(&d, regExp); } @@ -2341,6 +2355,7 @@ QPointF QVariant::toPointF() const #endif // QT_NO_GEOM_VARIANT +#ifndef QT_BOOTSTRAPPED /*! \fn QUrl QVariant::toUrl() const @@ -2353,6 +2368,7 @@ QUrl QVariant::toUrl() const { return qVariantToHelper<QUrl>(d, Url, handler); } +#endif /*! \fn QLocale QVariant::toLocale() const |