diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2011-09-09 15:27:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-24 16:30:58 +0100 |
| commit | 6ab6b0fc1c594a589d96d17b5ab7bdc237290f6e (patch) | |
| tree | 32aeee16ce365def37daec8da690650758479556 /src/corelib/kernel/qvariant.h | |
| parent | 5e0406cbdf60302379fec092c0bac8f1745b62df (diff) | |
Disable QUrl support in QVariant in bootstrapped mode
The only use of QUrl in qmake, moc, uic and rcc is due to QVariant's
internals, so let's disable it. This means those binaries are now
probably a lot smaller since the parsing and IDNA code don't need to
be present.
Change-Id: Ie156b0817d119b2ba5d3dcb9712a9fea2ee7d4a1
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index cc502d93a7..fb0e059f45 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -237,7 +237,6 @@ class Q_CORE_EXPORT QVariant QVariant(const QRect &rect); QVariant(const QRectF &rect); #endif - QVariant(const QUrl &url); QVariant(const QLocale &locale); #ifndef QT_NO_REGEXP QVariant(const QRegExp ®Exp); @@ -246,6 +245,7 @@ class Q_CORE_EXPORT QVariant #endif // QT_BOOTSTRAPPED #endif // QT_NO_REGEXP #ifndef QT_BOOTSTRAPPED + QVariant(const QUrl &url); QVariant(const QEasingCurve &easing); #endif QVariant(Qt::GlobalColor color); @@ -303,7 +303,6 @@ class Q_CORE_EXPORT QVariant QLineF toLineF() const; QRectF toRectF() const; #endif - QUrl toUrl() const; QLocale toLocale() const; #ifndef QT_NO_REGEXP QRegExp toRegExp() const; @@ -312,6 +311,7 @@ class Q_CORE_EXPORT QVariant #endif // QT_BOOTSTRAPPED #endif // QT_NO_REGEXP #ifndef QT_BOOTSTRAPPED + QUrl toUrl() const; QEasingCurve toEasingCurve() const; #endif |