From 03deed59ba31bd2e5ac1e799e0eb03cd4e8f5e41 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 28 Jun 2011 23:43:58 +0200 Subject: Remove the remaining QT3_SUPPORT code in corelib Change-Id: I6641c62d75d2034a46ea7cc869ae65285ae8b8f4 Reviewed-on: http://codereview.qt.nokia.com/866 Reviewed-by: Qt Sanity Bot Reviewed-by: Liang Qi --- src/corelib/kernel/qmetatype.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/corelib/kernel/qmetatype.h') diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 36131d1815..767d79a14e 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -72,9 +72,7 @@ public: QVariantHash = 28, QEasingCurve = 29, LastCoreType = QEasingCurve, FirstGuiType = 63 /* QColorGroup */, -#ifdef QT3_SUPPORT - QColorGroup = 63, -#endif + QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68, QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73, QCursor = 74, QSizePolicy = 75, QKeySequence = 76, QPen = 77, @@ -313,9 +311,6 @@ class QEasingCurve; class QWidget; class QObject; -#ifdef QT3_SUPPORT -class QColorGroup; -#endif class QFont; class QPixmap; class QBrush; @@ -383,9 +378,6 @@ Q_DECLARE_BUILTIN_METATYPE(QRegExp, QRegExp) #endif Q_DECLARE_BUILTIN_METATYPE(QEasingCurve, QEasingCurve) -#ifdef QT3_SUPPORT -Q_DECLARE_BUILTIN_METATYPE(QColorGroup, QColorGroup) -#endif Q_DECLARE_BUILTIN_METATYPE(QFont, QFont) Q_DECLARE_BUILTIN_METATYPE(QPixmap, QPixmap) Q_DECLARE_BUILTIN_METATYPE(QBrush, QBrush) -- cgit v1.2.3