Controls: append "1" to all C++ classes

This is consistent with the classes that have already had this done.
It prevents clashes with Qt Quick Controls 2.
These classes are not available to the user, so it doesn't affect
compatibility.

Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

26 files changed, 329 insertions, 329 deletions

diff --git a/src/controls/Private/qquickabstractstyle.cpp b/src/controls/Private/qquickabstractstyle.cpp
index 8d049614..065f7171 100644
--- a/src/controls/Private/qquickabstractstyle.cpp
+++ b/src/controls/Private/qquickabstractstyle.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype AbstractStyle
-    \instantiates QQuickAbstractStyle
+    \instantiates QQuickAbstractStyle1
     \qmlabstract
     \internal
 */
@@ -58,39 +58,39 @@ QT_BEGIN_NAMESPACE
     This grouped property holds the \c top, \c left, \c right and \c bottom padding.
 */
 
-QQuickAbstractStyle::QQuickAbstractStyle(QObject *parent) : QObject(parent)
+QQuickAbstractStyle1::QQuickAbstractStyle1(QObject *parent) : QObject(parent)
 {
 }
 
-QQmlListProperty<QObject> QQuickAbstractStyle::data()
+QQmlListProperty<QObject> QQuickAbstractStyle1::data()
 {
-    return QQmlListProperty<QObject>(this, 0, &QQuickAbstractStyle::data_append, &QQuickAbstractStyle::data_count,
-                                     &QQuickAbstractStyle::data_at, &QQuickAbstractStyle::data_clear);
+    return QQmlListProperty<QObject>(this, 0, &QQuickAbstractStyle1::data_append, &QQuickAbstractStyle1::data_count,
+                                     &QQuickAbstractStyle1::data_at, &QQuickAbstractStyle1::data_clear);
 }
 
-void QQuickAbstractStyle::data_append(QQmlListProperty<QObject> *list, QObject *object)
+void QQuickAbstractStyle1::data_append(QQmlListProperty<QObject> *list, QObject *object)
 {
-    if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object))
+    if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object))
         style->m_data.append(object);
 }
 
-int QQuickAbstractStyle::data_count(QQmlListProperty<QObject> *list)
+int QQuickAbstractStyle1::data_count(QQmlListProperty<QObject> *list)
 {
-    if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object))
+    if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object))
         return style->m_data.count();
     return 0;
 }
 
-QObject *QQuickAbstractStyle::data_at(QQmlListProperty<QObject> *list, int index)
+QObject *QQuickAbstractStyle1::data_at(QQmlListProperty<QObject> *list, int index)
 {
-    if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object))
+    if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object))
         return style->m_data.at(index);
     return 0;
 }
 
-void QQuickAbstractStyle::data_clear(QQmlListProperty<QObject> *list)
+void QQuickAbstractStyle1::data_clear(QQmlListProperty<QObject> *list)
 {
-    if (QQuickAbstractStyle *style = qobject_cast<QQuickAbstractStyle *>(list->object))
+    if (QQuickAbstractStyle1 *style = qobject_cast<QQuickAbstractStyle1 *>(list->object))
         style->m_data.clear();
 }
 
diff --git a/src/controls/Private/qquickabstractstyle_p.h b/src/controls/Private/qquickabstractstyle_p.h
index 50404cfa..735c33c3 100644
--- a/src/controls/Private/qquickabstractstyle_p.h
+++ b/src/controls/Private/qquickabstractstyle_p.h
@@ -46,18 +46,18 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractStyle : public QObject
+class QQuickAbstractStyle1 : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QQuickPadding* padding READ padding CONSTANT)
+    Q_PROPERTY(QQuickPadding1* padding READ padding CONSTANT)
     Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
-    QQuickAbstractStyle(QObject *parent = 0);
+    QQuickAbstractStyle1(QObject *parent = 0);
 
-    QQuickPadding* padding() { return &m_padding; }
+    QQuickPadding1* padding() { return &m_padding; }
 
     QQmlListProperty<QObject> data();
 
@@ -67,7 +67,7 @@ private:
     static QObject *data_at(QQmlListProperty<QObject> *list, int index);
     static void data_clear(QQmlListProperty<QObject> *list);
 
-    QQuickPadding m_padding;
+    QQuickPadding1 m_padding;
     QList<QObject *> m_data;
 };
 
diff --git a/src/controls/Private/qquickcalendarmodel.cpp b/src/controls/Private/qquickcalendarmodel.cpp
index cbef3cb1..64d52f95 100644
--- a/src/controls/Private/qquickcalendarmodel.cpp
+++ b/src/controls/Private/qquickcalendarmodel.cpp
@@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE
     [03][04][05][06][07][08][09]
 */
 
-QQuickCalendarModel::QQuickCalendarModel(QObject *parent) :
+QQuickCalendarModel1::QQuickCalendarModel1(QObject *parent) :
     QAbstractListModel(parent)
 {
 }
@@ -90,7 +90,7 @@ QQuickCalendarModel::QQuickCalendarModel(QObject *parent) :
     We store all of the days in the month of visibleDate, as well as any days
     in the previous or following month if there is enough space.
 */
-QDate QQuickCalendarModel::visibleDate() const
+QDate QQuickCalendarModel1::visibleDate() const
 {
     return mVisibleDate;
 }
@@ -102,7 +102,7 @@ QDate QQuickCalendarModel::visibleDate() const
     visible date, the visible date is changed and
     populateFromVisibleDate() called.
 */
-void QQuickCalendarModel::setVisibleDate(const QDate &date)
+void QQuickCalendarModel1::setVisibleDate(const QDate &date)
 {
     if (date != mVisibleDate && date.isValid()) {
         const QDate previousDate = mVisibleDate;
@@ -137,7 +137,7 @@ void QQuickCalendarModel::setVisibleDate(const QDate &date)
     [30][31][01][02][03][04][05]
     ...
 */
-QLocale QQuickCalendarModel::locale() const
+QLocale QQuickCalendarModel1::locale() const
 {
     return mLocale;
 }
@@ -145,7 +145,7 @@ QLocale QQuickCalendarModel::locale() const
 /*!
     Sets the locale to \a locale.
 */
-void QQuickCalendarModel::setLocale(const QLocale &locale)
+void QQuickCalendarModel1::setLocale(const QLocale &locale)
 {
     if (locale != mLocale) {
         Qt::DayOfWeek previousFirstDayOfWeek = mLocale.firstDayOfWeek();
@@ -159,19 +159,19 @@ void QQuickCalendarModel::setLocale(const QLocale &locale)
     }
 }
 
-QVariant QQuickCalendarModel::data(const QModelIndex &index, int role) const
+QVariant QQuickCalendarModel1::data(const QModelIndex &index, int role) const
 {
     if (role == DateRole)
         return mVisibleDates.at(index.row());
     return QVariant();
 }
 
-int QQuickCalendarModel::rowCount(const QModelIndex &) const
+int QQuickCalendarModel1::rowCount(const QModelIndex &) const
 {
     return mVisibleDates.isEmpty() ? 0 : weeksOnACalendarMonth * daysInAWeek;
 }
 
-QHash<int, QByteArray> QQuickCalendarModel::roleNames() const
+QHash<int, QByteArray> QQuickCalendarModel1::roleNames() const
 {
     QHash<int, QByteArray> names;
     names[DateRole] = QByteArrayLiteral("date");
@@ -181,7 +181,7 @@ QHash<int, QByteArray> QQuickCalendarModel::roleNames() const
 /*!
     Returns the date at \a index, or an invalid date if \a index is invalid.
 */
-QDate QQuickCalendarModel::dateAt(int index) const
+QDate QQuickCalendarModel1::dateAt(int index) const
 {
     return index >= 0 && index < mVisibleDates.size() ? mVisibleDates.at(index) : QDate();
 }
@@ -189,7 +189,7 @@ QDate QQuickCalendarModel::dateAt(int index) const
 /*!
     Returns the index for \a date, or -1 if \a date is outside of our range.
 */
-int QQuickCalendarModel::indexAt(const QDate &date)
+int QQuickCalendarModel1::indexAt(const QDate &date)
 {
     if (mVisibleDates.size() == 0 || date < mFirstVisibleDate || date > mLastVisibleDate)
         return -1;
@@ -204,7 +204,7 @@ int QQuickCalendarModel::indexAt(const QDate &date)
     Returns the week number for the first day of the week corresponding to \a row,
     or -1 if \a row is outside of our range.
 */
-int QQuickCalendarModel::weekNumberAt(int row) const
+int QQuickCalendarModel1::weekNumberAt(int row) const
 {
     const int index = row * daysInAWeek;
     const QDate date = dateAt(index);
@@ -223,7 +223,7 @@ int QQuickCalendarModel::weekNumberAt(int row) const
     shown doesn't change, but the days displayed do.
     The \a previousDate parameter is ignored when \a force is true.
 */
-void QQuickCalendarModel::populateFromVisibleDate(const QDate &previousDate, bool force)
+void QQuickCalendarModel1::populateFromVisibleDate(const QDate &previousDate, bool force)
 {
     // We don't need to populate if the year and month haven't changed.
     if (!force && mVisibleDate.year() == previousDate.year() && mVisibleDate.month() == previousDate.month())
diff --git a/src/controls/Private/qquickcalendarmodel_p.h b/src/controls/Private/qquickcalendarmodel_p.h
index 5feed58a..cb47c576 100644
--- a/src/controls/Private/qquickcalendarmodel_p.h
+++ b/src/controls/Private/qquickcalendarmodel_p.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickCalendarModel : public QAbstractListModel
+class QQuickCalendarModel1 : public QAbstractListModel
 {
     Q_OBJECT
     Q_PROPERTY(QDate visibleDate READ visibleDate WRITE setVisibleDate NOTIFY visibleDateChanged)
@@ -56,7 +56,7 @@ class QQuickCalendarModel : public QAbstractListModel
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
 
 public:
-    explicit QQuickCalendarModel(QObject *parent = 0);
+    explicit QQuickCalendarModel1(QObject *parent = 0);
 
     enum {
         // If this class is made public, this will have to be changed.
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index 39758e4e..d60f3b99 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -83,7 +83,7 @@ static bool fromResource(const QString &path)
     return path.startsWith(":/");
 }
 
-bool QQuickControlSettings::hasTouchScreen() const
+bool QQuickControlSettings1::hasTouchScreen() const
 {
 // QTBUG-36007
 #if defined(Q_OS_ANDROID)
@@ -97,7 +97,7 @@ bool QQuickControlSettings::hasTouchScreen() const
 #endif
 }
 
-bool QQuickControlSettings::isMobile() const
+bool QQuickControlSettings1::isMobile() const
 {
 #if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
     return true;
@@ -109,17 +109,17 @@ bool QQuickControlSettings::isMobile() const
 #endif
 }
 
-bool QQuickControlSettings::hoverEnabled() const
+bool QQuickControlSettings1::hoverEnabled() const
 {
     return !isMobile() || !hasTouchScreen();
 }
 
-QString QQuickControlSettings::makeStyleComponentPath(const QString &controlStyleName, const QString &styleDirPath)
+QString QQuickControlSettings1::makeStyleComponentPath(const QString &controlStyleName, const QString &styleDirPath)
 {
     return styleDirPath + QStringLiteral("/") + controlStyleName;
 }
 
-QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleName, const QString &styleDirPath)
+QUrl QQuickControlSettings1::makeStyleComponentUrl(const QString &controlStyleName, const QString &styleDirPath)
 {
     QString styleFilePath = makeStyleComponentPath(controlStyleName, styleDirPath);
 
@@ -129,7 +129,7 @@ QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleNam
     return QUrl::fromLocalFile(styleFilePath);
 }
 
-QQmlComponent *QQuickControlSettings::styleComponent(const QUrl &styleDirUrl, const QString &controlStyleName, QObject *control)
+QQmlComponent *QQuickControlSettings1::styleComponent(const QUrl &styleDirUrl, const QString &controlStyleName, QObject *control)
 {
     Q_UNUSED(styleDirUrl); // required for hack that forces this function to be re-called from within QML when style changes
 
@@ -188,7 +188,7 @@ static QString styleImportPath(QQmlEngine *engine, const QString &styleName)
     return path;
 }
 
-QQuickControlSettings::QQuickControlSettings(QQmlEngine *engine)
+QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine)
 {
     // First, register all style paths in the default style location.
     QDir dir;
@@ -231,7 +231,7 @@ QQuickControlSettings::QQuickControlSettings(QQmlEngine *engine)
     connect(this, SIGNAL(stylePathChanged()), SIGNAL(styleChanged()));
 }
 
-bool QQuickControlSettings::resolveCurrentStylePath()
+bool QQuickControlSettings1::resolveCurrentStylePath()
 {
     if (!m_styleMap.contains(m_name)) {
         qWarning() << "WARNING: Cannot find style" << m_name;
@@ -267,7 +267,7 @@ bool QQuickControlSettings::resolveCurrentStylePath()
     return true;
 }
 
-void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleName)
+void QQuickControlSettings1::findStyle(QQmlEngine *engine, const QString &styleName)
 {
     QString path = styleImportPath(engine, styleName);
     QDir dir;
@@ -298,7 +298,7 @@ void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleNa
     m_styleMap[styleName] = styleData;
 }
 
-QUrl QQuickControlSettings::style() const
+QUrl QQuickControlSettings1::style() const
 {
     QUrl result;
     QString path = styleFilePath();
@@ -311,12 +311,12 @@ QUrl QQuickControlSettings::style() const
     return result;
 }
 
-QString QQuickControlSettings::styleName() const
+QString QQuickControlSettings1::styleName() const
 {
     return m_name;
 }
 
-void QQuickControlSettings::setStyleName(const QString &name)
+void QQuickControlSettings1::setStyleName(const QString &name)
 {
     if (m_name != name) {
         QString oldName = m_name;
@@ -330,12 +330,12 @@ void QQuickControlSettings::setStyleName(const QString &name)
     }
 }
 
-QString QQuickControlSettings::stylePath() const
+QString QQuickControlSettings1::stylePath() const
 {
     return m_path;
 }
 
-void QQuickControlSettings::setStylePath(const QString &path)
+void QQuickControlSettings1::setStylePath(const QString &path)
 {
     if (m_path != path) {
         m_path = path;
@@ -343,14 +343,14 @@ void QQuickControlSettings::setStylePath(const QString &path)
     }
 }
 
-QString QQuickControlSettings::styleFilePath() const
+QString QQuickControlSettings1::styleFilePath() const
 {
     return m_path;
 }
 
 extern Q_GUI_EXPORT int qt_defaultDpiX();
 
-qreal QQuickControlSettings::dpiScaleFactor() const
+qreal QQuickControlSettings1::dpiScaleFactor() const
 {
 #ifndef Q_OS_MAC
     return (qreal(qt_defaultDpiX()) / 96.0);
@@ -358,7 +358,7 @@ qreal QQuickControlSettings::dpiScaleFactor() const
     return 1.0;
 }
 
-qreal QQuickControlSettings::dragThreshold() const
+qreal QQuickControlSettings1::dragThreshold() const
 {
     return qApp->styleHints()->startDragDistance();
 }
diff --git a/src/controls/Private/qquickcontrolsettings_p.h b/src/controls/Private/qquickcontrolsettings_p.h
index bb857c79..aa3e4b2d 100644
--- a/src/controls/Private/qquickcontrolsettings_p.h
+++ b/src/controls/Private/qquickcontrolsettings_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlEngine;
 
-class QQuickControlSettings : public QObject
+class QQuickControlSettings1 : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QUrl style READ style NOTIFY styleChanged)
@@ -63,7 +63,7 @@ class QQuickControlSettings : public QObject
     Q_PROPERTY(bool hoverEnabled READ hoverEnabled CONSTANT)
 
 public:
-    QQuickControlSettings(QQmlEngine *engine);
+    QQuickControlSettings1(QQmlEngine *engine);
 
     QUrl style() const;
 
diff --git a/src/controls/Private/qquickcontrolsprivate.cpp b/src/controls/Private/qquickcontrolsprivate.cpp
index 2f9b310b..6dd5fa2f 100644
--- a/src/controls/Private/qquickcontrolsprivate.cpp
+++ b/src/controls/Private/qquickcontrolsprivate.cpp
@@ -43,34 +43,34 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickControlsPrivateAttached::QQuickControlsPrivateAttached(QObject *attachee)
+QQuickControlsPrivate1Attached::QQuickControlsPrivate1Attached(QObject *attachee)
     : m_attachee(qobject_cast<QQuickItem*>(attachee))
 {
     if (m_attachee)
-        connect(m_attachee, &QQuickItem::windowChanged, this, &QQuickControlsPrivateAttached::windowChanged);
+        connect(m_attachee, &QQuickItem::windowChanged, this, &QQuickControlsPrivate1Attached::windowChanged);
 }
 
-QQuickWindow *QQuickControlsPrivateAttached::window() const
+QQuickWindow *QQuickControlsPrivate1Attached::window() const
 {
     return m_attachee ? m_attachee->window() : 0;
 }
 
-QObject *QQuickControlsPrivate::registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine)
+QObject *QQuickControlsPrivate1::registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine)
 {
     Q_UNUSED(engine);
     Q_UNUSED(jsEngine);
-    return new QQuickTooltip();
+    return new QQuickTooltip1();
 }
 
-QObject *QQuickControlsPrivate::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine)
+QObject *QQuickControlsPrivate1::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine)
 {
     Q_UNUSED(jsEngine);
-    return new QQuickControlSettings(engine);
+    return new QQuickControlSettings1(engine);
 }
 
-QQuickControlsPrivateAttached *QQuickControlsPrivate::qmlAttachedProperties(QObject *object)
+QQuickControlsPrivate1Attached *QQuickControlsPrivate1::qmlAttachedProperties(QObject *object)
 {
-    return new QQuickControlsPrivateAttached(object);
+    return new QQuickControlsPrivate1Attached(object);
 }
 
 QT_END_NAMESPACE
diff --git a/src/controls/Private/qquickcontrolsprivate_p.h b/src/controls/Private/qquickcontrolsprivate_p.h
index 52c309ef..4302f80a 100644
--- a/src/controls/Private/qquickcontrolsprivate_p.h
+++ b/src/controls/Private/qquickcontrolsprivate_p.h
@@ -48,13 +48,13 @@ QT_BEGIN_NAMESPACE
 
 class QQuickWindow;
 
-class QQuickControlsPrivateAttached : public QObject
+class QQuickControlsPrivate1Attached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickWindow* window READ window NOTIFY windowChanged)
 
 public:
-    QQuickControlsPrivateAttached(QObject* attachee);
+    QQuickControlsPrivate1Attached(QObject* attachee);
 
     QQuickWindow *window() const;
 
@@ -65,7 +65,7 @@ private:
     QQuickItem* m_attachee;
 };
 
-class QQuickControlsPrivate : public QObject
+class QQuickControlsPrivate1 : public QObject
 {
     Q_OBJECT
 
@@ -73,11 +73,11 @@ public:
     static QObject *registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine);
     static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine);
 
-    static QQuickControlsPrivateAttached *qmlAttachedProperties(QObject *object);
+    static QQuickControlsPrivate1Attached *qmlAttachedProperties(QObject *object);
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQuickControlsPrivate, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQuickControlsPrivate1, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QQUICKCONTROLSPRIVATE_P_H
diff --git a/src/controls/Private/qquickpadding_p.h b/src/controls/Private/qquickpadding_p.h
index 6fe2eb38..54518b93 100644
--- a/src/controls/Private/qquickpadding_p.h
+++ b/src/controls/Private/qquickpadding_p.h
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickPadding : public QObject
+class QQuickPadding1 : public QObject
 {
     Q_OBJECT
 
@@ -59,7 +59,7 @@ class QQuickPadding : public QObject
     int m_bottom;
 
 public:
-    QQuickPadding(QObject *parent = 0) :
+    QQuickPadding1(QObject *parent = 0) :
         QObject(parent),
         m_left(0),
         m_top(0),
diff --git a/src/controls/Private/qquickrangeddate.cpp b/src/controls/Private/qquickrangeddate.cpp
index e1b3c60e..231a798a 100644
--- a/src/controls/Private/qquickrangeddate.cpp
+++ b/src/controls/Private/qquickrangeddate.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC_WITH_ARGS(const QDate, jsMinimumDate, (QDate(1, 1, 1)))
 Q_GLOBAL_STATIC_WITH_ARGS(const QDate, jsMaximumDate, (QDate(275759, 10, 25)))
 
-QQuickRangedDate::QQuickRangedDate() :
+QQuickRangedDate1::QQuickRangedDate1() :
     QObject(0),
     mDate(QDate::currentDate()),
     mMinimumDate(*jsMinimumDate),
@@ -56,7 +56,7 @@ QQuickRangedDate::QQuickRangedDate() :
 /*! \internal
     \qmlproperty date QQuickRangedDate::date
 */
-void QQuickRangedDate::setDate(const QDate &date)
+void QQuickRangedDate1::setDate(const QDate &date)
 {
     if (date == mDate)
         return;
@@ -75,7 +75,7 @@ void QQuickRangedDate::setDate(const QDate &date)
 /*! \internal
     \qmlproperty date QQuickRangedDate::minimumDate
 */
-void QQuickRangedDate::setMinimumDate(const QDate &minimumDate)
+void QQuickRangedDate1::setMinimumDate(const QDate &minimumDate)
 {
     if (minimumDate == mMinimumDate)
         return;
@@ -93,7 +93,7 @@ void QQuickRangedDate::setMinimumDate(const QDate &minimumDate)
 /*! \internal
     \qmlproperty date QQuickRangedDate::maximumDate
 */
-void QQuickRangedDate::setMaximumDate(const QDate &maximumDate)
+void QQuickRangedDate1::setMaximumDate(const QDate &maximumDate)
 {
     if (maximumDate == mMaximumDate)
         return;
diff --git a/src/controls/Private/qquickrangeddate_p.h b/src/controls/Private/qquickrangeddate_p.h
index b2bb3523..6ac7bc12 100644
--- a/src/controls/Private/qquickrangeddate_p.h
+++ b/src/controls/Private/qquickrangeddate_p.h
@@ -46,15 +46,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickRangedDate : public QObject
+class QQuickRangedDate1 : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged RESET resetDate)
     Q_PROPERTY(QDate minimumDate READ minimumDate WRITE setMinimumDate NOTIFY minimumDateChanged RESET resetMinimumDate)
     Q_PROPERTY(QDate maximumDate READ maximumDate WRITE setMaximumDate NOTIFY maximumDateChanged RESET resetMaximumDate)
 public:
-    QQuickRangedDate();
-    ~QQuickRangedDate() {}
+    QQuickRangedDate1();
+    ~QQuickRangedDate1() {}
 
     QDate date() const { return mDate; }
     void setDate(const QDate &date);
@@ -81,6 +81,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickRangedDate)
+QML_DECLARE_TYPE(QQuickRangedDate1)
 
 #endif // QQUICKRANGEDDATE_H
diff --git a/src/controls/Private/qquickrangemodel.cpp b/src/controls/Private/qquickrangemodel.cpp
index ac11fe71..4a685bf3 100644
--- a/src/controls/Private/qquickrangemodel.cpp
+++ b/src/controls/Private/qquickrangemodel.cpp
@@ -53,16 +53,16 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickRangeModelPrivate::QQuickRangeModelPrivate(QQuickRangeModel *qq)
+QQuickRangeModel1Private::QQuickRangeModel1Private(QQuickRangeModel1 *qq)
     : q_ptr(qq)
 {
 }
 
-QQuickRangeModelPrivate::~QQuickRangeModelPrivate()
+QQuickRangeModel1Private::~QQuickRangeModel1Private()
 {
 }
 
-void QQuickRangeModelPrivate::init()
+void QQuickRangeModel1Private::init()
 {
     minimum = 0;
     maximum = 99;
@@ -81,7 +81,7 @@ void QQuickRangeModelPrivate::init()
     and \a position that is passed as parameter.
 */
 
-qreal QQuickRangeModelPrivate::publicPosition(qreal position) const
+qreal QQuickRangeModel1Private::publicPosition(qreal position) const
 {
     // Calculate the equivalent stepSize for the position property.
     const qreal min = effectivePosAtMin();
@@ -122,7 +122,7 @@ qreal QQuickRangeModelPrivate::publicPosition(qreal position) const
     and \a value that is passed as parameter.
 */
 
-qreal QQuickRangeModelPrivate::publicValue(qreal value) const
+qreal QQuickRangeModel1Private::publicValue(qreal value) const
 {
     // It is important to do value-within-range check this
     // late (as opposed to during setPosition()). The reason is
@@ -150,9 +150,9 @@ qreal QQuickRangeModelPrivate::publicValue(qreal value) const
     has changed.
 */
 
-void QQuickRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition)
+void QQuickRangeModel1Private::emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition)
 {
-    Q_Q(QQuickRangeModel);
+    Q_Q(QQuickRangeModel1);
 
     // Effective value and position might have changed even in cases when e.g. d->value is
     // unchanged. This will be the case when operating with values outside range:
@@ -168,10 +168,10 @@ void QQuickRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue
     Constructs a QQuickRangeModel with \a parent
 */
 
-QQuickRangeModel::QQuickRangeModel(QObject *parent)
-    : QObject(parent), d_ptr(new QQuickRangeModelPrivate(this))
+QQuickRangeModel1::QQuickRangeModel1(QObject *parent)
+    : QObject(parent), d_ptr(new QQuickRangeModel1Private(this))
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
     d->init();
 }
 
@@ -180,10 +180,10 @@ QQuickRangeModel::QQuickRangeModel(QObject *parent)
     Constructs a QQuickRangeModel with private class pointer \a dd and \a parent
 */
 
-QQuickRangeModel::QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent)
+QQuickRangeModel1::QQuickRangeModel1(QQuickRangeModel1Private &dd, QObject *parent)
     : QObject(parent), d_ptr(&dd)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
     d->init();
 }
 
@@ -191,7 +191,7 @@ QQuickRangeModel::QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent)
     Destroys the QQuickRangeModel
 */
 
-QQuickRangeModel::~QQuickRangeModel()
+QQuickRangeModel1::~QQuickRangeModel1()
 {
     delete d_ptr;
     d_ptr = 0;
@@ -203,9 +203,9 @@ QQuickRangeModel::~QQuickRangeModel()
     Such range is represented by \l positionAtMinimum and \l positionAtMaximum
 */
 
-void QQuickRangeModel::setPositionRange(qreal min, qreal max)
+void QQuickRangeModel1::setPositionRange(qreal min, qreal max)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
 
     bool emitPosAtMinChanged = !qFuzzyCompare(min, d->posatmin);
     bool emitPosAtMaxChanged = !qFuzzyCompare(max, d->posatmax);
@@ -238,9 +238,9 @@ void QQuickRangeModel::setPositionRange(qreal min, qreal max)
     Such range is represented by \l minimumValue and \l maximumValue
 */
 
-void QQuickRangeModel::setRange(qreal min, qreal max)
+void QQuickRangeModel1::setRange(qreal min, qreal max)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
 
     bool emitMinimumChanged = !qFuzzyCompare(min, d->minimum);
     bool emitMaximumChanged = !qFuzzyCompare(max, d->maximum);
@@ -272,15 +272,15 @@ void QQuickRangeModel::setRange(qreal min, qreal max)
     This property's default value is 0
 */
 
-void QQuickRangeModel::setMinimum(qreal min)
+void QQuickRangeModel1::setMinimum(qreal min)
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     setRange(min, d->maximum);
 }
 
-qreal QQuickRangeModel::minimum() const
+qreal QQuickRangeModel1::minimum() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     return d->minimum;
 }
 
@@ -291,17 +291,17 @@ qreal QQuickRangeModel::minimum() const
     This property's default value is 99
 */
 
-void QQuickRangeModel::setMaximum(qreal max)
+void QQuickRangeModel1::setMaximum(qreal max)
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     // if the new maximum value is smaller than
     // minimum, update minimum too
     setRange(qMin(d->minimum, max), max);
 }
 
-qreal QQuickRangeModel::maximum() const
+qreal QQuickRangeModel1::maximum() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     return d->maximum;
 }
 
@@ -313,9 +313,9 @@ qreal QQuickRangeModel::maximum() const
     to 30, the valid values that are going to be seen externally would be: 0, 30, 60, 90, 100.
 */
 
-void QQuickRangeModel::setStepSize(qreal stepSize)
+void QQuickRangeModel1::setStepSize(qreal stepSize)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
 
     stepSize = qMax(qreal(0.0), stepSize);
     if (qFuzzyCompare(stepSize, d->stepSize))
@@ -329,9 +329,9 @@ void QQuickRangeModel::setStepSize(qreal stepSize)
     d->emitValueAndPositionIfChanged(oldValue, oldPosition);
 }
 
-qreal QQuickRangeModel::stepSize() const
+qreal QQuickRangeModel1::stepSize() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     return d->stepSize;
 }
 
@@ -341,9 +341,9 @@ qreal QQuickRangeModel::stepSize() const
     Such calculation is based on the parameter \a value (which is valid externally).
 */
 
-qreal QQuickRangeModel::positionForValue(qreal value) const
+qreal QQuickRangeModel1::positionForValue(qreal value) const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
 
     const qreal unconstrainedPosition = d->equivalentPosition(value);
     return d->publicPosition(unconstrainedPosition);
@@ -359,18 +359,18 @@ qreal QQuickRangeModel::positionForValue(qreal value) const
     since it can become valid if the user changes the position range later.
 */
 
-qreal QQuickRangeModel::position() const
+qreal QQuickRangeModel1::position() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
 
     // Return the internal position but observe boundaries and
     // stepSize restrictions.
     return d->publicPosition(d->pos);
 }
 
-void QQuickRangeModel::setPosition(qreal newPosition)
+void QQuickRangeModel1::setPosition(qreal newPosition)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
 
     if (qFuzzyCompare(newPosition, d->pos))
         return;
@@ -391,15 +391,15 @@ void QQuickRangeModel::setPosition(qreal newPosition)
     This property's default value is 0
 */
 
-void QQuickRangeModel::setPositionAtMinimum(qreal min)
+void QQuickRangeModel1::setPositionAtMinimum(qreal min)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
     setPositionRange(min, d->posatmax);
 }
 
-qreal QQuickRangeModel::positionAtMinimum() const
+qreal QQuickRangeModel1::positionAtMinimum() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     return d->posatmin;
 }
 
@@ -410,15 +410,15 @@ qreal QQuickRangeModel::positionAtMinimum() const
     This property's default value is 0
 */
 
-void QQuickRangeModel::setPositionAtMaximum(qreal max)
+void QQuickRangeModel1::setPositionAtMaximum(qreal max)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
     setPositionRange(d->posatmin, max);
 }
 
-qreal QQuickRangeModel::positionAtMaximum() const
+qreal QQuickRangeModel1::positionAtMaximum() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     return d->posatmax;
 }
 
@@ -428,9 +428,9 @@ qreal QQuickRangeModel::positionAtMaximum() const
     Such calculation is based on the parameter \a position (which is valid externally).
 */
 
-qreal QQuickRangeModel::valueForPosition(qreal position) const
+qreal QQuickRangeModel1::valueForPosition(qreal position) const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
 
     const qreal unconstrainedValue = d->equivalentValue(position);
     return d->publicValue(unconstrainedValue);
@@ -446,18 +446,18 @@ qreal QQuickRangeModel::valueForPosition(qreal position) const
     since it can become valid if the user changes the range later.
 */
 
-qreal QQuickRangeModel::value() const
+qreal QQuickRangeModel1::value() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
 
     // Return internal value but observe boundaries and
     // stepSize restrictions
     return d->publicValue(d->value);
 }
 
-void QQuickRangeModel::setValue(qreal newValue)
+void QQuickRangeModel1::setValue(qreal newValue)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
 
     if (qFuzzyCompare(newValue, d->value))
         return;
@@ -480,9 +480,9 @@ void QQuickRangeModel::setValue(qreal newValue)
     minimum (represented by \l positionAtMinimum).
 */
 
-void QQuickRangeModel::setInverted(bool inverted)
+void QQuickRangeModel1::setInverted(bool inverted)
 {
-    Q_D(QQuickRangeModel);
+    Q_D(QQuickRangeModel1);
     if (inverted == d->inverted)
         return;
 
@@ -493,9 +493,9 @@ void QQuickRangeModel::setInverted(bool inverted)
     setPosition(d->equivalentPosition(d->value));
 }
 
-bool QQuickRangeModel::inverted() const
+bool QQuickRangeModel1::inverted() const
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     return d->inverted;
 }
 
@@ -503,9 +503,9 @@ bool QQuickRangeModel::inverted() const
     Sets the \l value to \l minimumValue.
 */
 
-void QQuickRangeModel::toMinimum()
+void QQuickRangeModel1::toMinimum()
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     setValue(d->minimum);
 }
 
@@ -513,24 +513,24 @@ void QQuickRangeModel::toMinimum()
     Sets the \l value to \l maximumValue.
 */
 
-void QQuickRangeModel::toMaximum()
+void QQuickRangeModel1::toMaximum()
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     setValue(d->maximum);
 }
 
-void QQuickRangeModel::increaseSingleStep()
+void QQuickRangeModel1::increaseSingleStep()
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     if (qFuzzyIsNull(d->stepSize))
         setValue(value() + (d->maximum - d->minimum)/10.0);
     else
         setValue(value() + d->stepSize);
 }
 
-void QQuickRangeModel::decreaseSingleStep()
+void QQuickRangeModel1::decreaseSingleStep()
 {
-    Q_D(const QQuickRangeModel);
+    Q_D(const QQuickRangeModel1);
     if (qFuzzyIsNull(d->stepSize))
         setValue(value() - (d->maximum - d->minimum)/10.0);
     else
diff --git a/src/controls/Private/qquickrangemodel_p.h b/src/controls/Private/qquickrangemodel_p.h
index 6e82b009..0c93bed3 100644
--- a/src/controls/Private/qquickrangemodel_p.h
+++ b/src/controls/Private/qquickrangemodel_p.h
@@ -45,9 +45,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickRangeModelPrivate;
+class QQuickRangeModel1Private;
 
-class QQuickRangeModel : public QObject
+class QQuickRangeModel1 : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged USER true)
@@ -60,8 +60,8 @@ class QQuickRangeModel : public QObject
     Q_PROPERTY(bool inverted READ inverted WRITE setInverted NOTIFY invertedChanged)
 
 public:
-    QQuickRangeModel(QObject *parent = 0);
-    virtual ~QQuickRangeModel();
+    QQuickRangeModel1(QObject *parent = 0);
+    virtual ~QQuickRangeModel1();
 
     void setRange(qreal min, qreal max);
     void setPositionRange(qreal min, qreal max);
@@ -112,17 +112,17 @@ Q_SIGNALS:
     void positionAtMaximumChanged(qreal max);
 
 protected:
-    QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent);
-    QQuickRangeModelPrivate* d_ptr;
+    QQuickRangeModel1(QQuickRangeModel1Private &dd, QObject *parent);
+    QQuickRangeModel1Private* d_ptr;
 
 private:
-    Q_DISABLE_COPY(QQuickRangeModel)
-    Q_DECLARE_PRIVATE(QQuickRangeModel)
+    Q_DISABLE_COPY(QQuickRangeModel1)
+    Q_DECLARE_PRIVATE(QQuickRangeModel1)
 
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickRangeModel)
+QML_DECLARE_TYPE(QQuickRangeModel1)
 
 #endif // QQUICKRANGEMODEL_P_H
diff --git a/src/controls/Private/qquickrangemodel_p_p.h b/src/controls/Private/qquickrangemodel_p_p.h
index 8bd57e5b..5c56814e 100644
--- a/src/controls/Private/qquickrangemodel_p_p.h
+++ b/src/controls/Private/qquickrangemodel_p_p.h
@@ -55,12 +55,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickRangeModelPrivate
+class QQuickRangeModel1Private
 {
-    Q_DECLARE_PUBLIC(QQuickRangeModel)
+    Q_DECLARE_PUBLIC(QQuickRangeModel1)
 public:
-    QQuickRangeModelPrivate(QQuickRangeModel *qq);
-    virtual ~QQuickRangeModelPrivate();
+    QQuickRangeModel1Private(QQuickRangeModel1 *qq);
+    virtual ~QQuickRangeModel1Private();
 
     void init();
 
@@ -69,7 +69,7 @@ public:
 
     uint inverted : 1;
 
-    QQuickRangeModel *q_ptr;
+    QQuickRangeModel1 *q_ptr;
 
     inline qreal effectivePosAtMin() const {
         return inverted ? posatmax : posatmin;
diff --git a/src/controls/Private/qquicksceneposlistener.cpp b/src/controls/Private/qquicksceneposlistener.cpp
index c829b344..4e5a4a5e 100644
--- a/src/controls/Private/qquicksceneposlistener.cpp
+++ b/src/controls/Private/qquicksceneposlistener.cpp
@@ -50,14 +50,14 @@ static const QQuickItemPrivate::ChangeTypes ItemChangeTypes = QQuickItemPrivate:
                                                              | QQuickItemPrivate::Parent
                                                              | QQuickItemPrivate::Destroyed;
 
-QQuickScenePosListener::QQuickScenePosListener(QObject *parent)
+QQuickScenePosListener1::QQuickScenePosListener1(QObject *parent)
     : QObject(parent)
     , m_enabled(false)
     , m_item(0)
 {
 }
 
-QQuickScenePosListener::~QQuickScenePosListener()
+QQuickScenePosListener1::~QQuickScenePosListener1()
 {
     if (m_item == 0)
         return;
@@ -66,12 +66,12 @@ QQuickScenePosListener::~QQuickScenePosListener()
     removeAncestorListeners(m_item->parentItem());
 }
 
-QQuickItem *QQuickScenePosListener::item() const
+QQuickItem *QQuickScenePosListener1::item() const
 {
     return m_item;
 }
 
-void QQuickScenePosListener::setItem(QQuickItem *item)
+void QQuickScenePosListener1::setItem(QQuickItem *item)
 {
     if (m_item == item)
         return;
@@ -94,17 +94,17 @@ void QQuickScenePosListener::setItem(QQuickItem *item)
     updateScenePos();
 }
 
-QPointF QQuickScenePosListener::scenePos() const
+QPointF QQuickScenePosListener1::scenePos() const
 {
     return m_scenePos;
 }
 
-bool QQuickScenePosListener::isEnabled() const
+bool QQuickScenePosListener1::isEnabled() const
 {
     return m_enabled;
 }
 
-void QQuickScenePosListener::setEnabled(bool enabled)
+void QQuickScenePosListener1::setEnabled(bool enabled)
 {
     if (m_enabled == enabled)
         return;
@@ -124,23 +124,23 @@ void QQuickScenePosListener::setEnabled(bool enabled)
     emit enabledChanged();
 }
 
-void QQuickScenePosListener::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &)
+void QQuickScenePosListener1::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &)
 {
     updateScenePos();
 }
 
-void QQuickScenePosListener::itemParentChanged(QQuickItem *, QQuickItem *parent)
+void QQuickScenePosListener1::itemParentChanged(QQuickItem *, QQuickItem *parent)
 {
     addAncestorListeners(parent);
 }
 
-void QQuickScenePosListener::itemChildRemoved(QQuickItem *, QQuickItem *child)
+void QQuickScenePosListener1::itemChildRemoved(QQuickItem *, QQuickItem *child)
 {
     if (isAncestor(child))
         removeAncestorListeners(child);
 }
 
-void QQuickScenePosListener::itemDestroyed(QQuickItem *item)
+void QQuickScenePosListener1::itemDestroyed(QQuickItem *item)
 {
     Q_ASSERT(m_item == item);
 
@@ -150,7 +150,7 @@ void QQuickScenePosListener::itemDestroyed(QQuickItem *item)
     removeAncestorListeners(item->parentItem());
 }
 
-void QQuickScenePosListener::updateScenePos()
+void QQuickScenePosListener1::updateScenePos()
 {
     const QPointF &scenePos = m_item->mapToScene(QPointF(0, 0));
     if (m_scenePos != scenePos) {
@@ -164,7 +164,7 @@ void QQuickScenePosListener::updateScenePos()
 
     Remove this listener from \a item and all its ancestors.
  */
-void QQuickScenePosListener::removeAncestorListeners(QQuickItem *item)
+void QQuickScenePosListener1::removeAncestorListeners(QQuickItem *item)
 {
     if (item == m_item)
         return;
@@ -181,7 +181,7 @@ void QQuickScenePosListener::removeAncestorListeners(QQuickItem *item)
 
     Injects this as a listener to \a item and all its ancestors.
  */
-void QQuickScenePosListener::addAncestorListeners(QQuickItem *item)
+void QQuickScenePosListener1::addAncestorListeners(QQuickItem *item)
 {
     if (item == m_item)
         return;
@@ -193,7 +193,7 @@ void QQuickScenePosListener::addAncestorListeners(QQuickItem *item)
     }
 }
 
-bool QQuickScenePosListener::isAncestor(QQuickItem *item) const
+bool QQuickScenePosListener1::isAncestor(QQuickItem *item) const
 {
     if (!m_item)
         return false;
diff --git a/src/controls/Private/qquicksceneposlistener_p.h b/src/controls/Private/qquicksceneposlistener_p.h
index f35ab75e..f66930e7 100644
--- a/src/controls/Private/qquicksceneposlistener_p.h
+++ b/src/controls/Private/qquicksceneposlistener_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickItem;
 
-class QQuickScenePosListener : public QObject, public QQuickItemChangeListener
+class QQuickScenePosListener1 : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *item READ item WRITE setItem FINAL)
@@ -57,8 +57,8 @@ class QQuickScenePosListener : public QObject, public QQuickItemChangeListener
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL)
 
 public:
-    explicit QQuickScenePosListener(QObject *parent = 0);
-    ~QQuickScenePosListener();
+    explicit QQuickScenePosListener1(QObject *parent = 0);
+    ~QQuickScenePosListener1();
 
     QQuickItem *item() const;
     void setItem(QQuickItem *item);
diff --git a/src/controls/Private/qquickspinboxvalidator.cpp b/src/controls/Private/qquickspinboxvalidator.cpp
index 895c85bb..6723defe 100644
--- a/src/controls/Private/qquickspinboxvalidator.cpp
+++ b/src/controls/Private/qquickspinboxvalidator.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickSpinBoxValidator::QQuickSpinBoxValidator(QObject *parent)
+QQuickSpinBoxValidator1::QQuickSpinBoxValidator1(QObject *parent)
     : QValidator(parent), m_value(0), m_step(1), m_initialized(false)
 {
     m_validator.setTop(99);
@@ -61,21 +61,21 @@ QQuickSpinBoxValidator::QQuickSpinBoxValidator(QObject *parent)
     connect(this, SIGNAL(suffixChanged()), this, SIGNAL(textChanged()));
 }
 
-QQuickSpinBoxValidator::~QQuickSpinBoxValidator()
+QQuickSpinBoxValidator1::~QQuickSpinBoxValidator1()
 {
 }
 
-QString QQuickSpinBoxValidator::text() const
+QString QQuickSpinBoxValidator1::text() const
 {
     return textFromValue(m_value);
 }
 
-qreal QQuickSpinBoxValidator::value() const
+qreal QQuickSpinBoxValidator1::value() const
 {
     return m_value;
 }
 
-void QQuickSpinBoxValidator::setValue(qreal value)
+void QQuickSpinBoxValidator1::setValue(qreal value)
 {
     if (m_initialized) {
         value = qBound(minimumValue(), value, maximumValue());
@@ -90,12 +90,12 @@ void QQuickSpinBoxValidator::setValue(qreal value)
     }
 }
 
-qreal QQuickSpinBoxValidator::minimumValue() const
+qreal QQuickSpinBoxValidator1::minimumValue() const
 {
     return m_validator.bottom();
 }
 
-void QQuickSpinBoxValidator::setMinimumValue(qreal min)
+void QQuickSpinBoxValidator1::setMinimumValue(qreal min)
 {
     if (min != m_validator.bottom()) {
         m_validator.setBottom(min);
@@ -105,12 +105,12 @@ void QQuickSpinBoxValidator::setMinimumValue(qreal min)
     }
 }
 
-qreal QQuickSpinBoxValidator::maximumValue() const
+qreal QQuickSpinBoxValidator1::maximumValue() const
 {
     return m_validator.top();
 }
 
-void QQuickSpinBoxValidator::setMaximumValue(qreal max)
+void QQuickSpinBoxValidator1::setMaximumValue(qreal max)
 {
     if (max != m_validator.top()) {
         m_validator.setTop(max);
@@ -120,12 +120,12 @@ void QQuickSpinBoxValidator::setMaximumValue(qreal max)
     }
 }
 
-int QQuickSpinBoxValidator::decimals() const
+int QQuickSpinBoxValidator1::decimals() const
 {
     return m_validator.decimals();
 }
 
-void QQuickSpinBoxValidator::setDecimals(int decimals)
+void QQuickSpinBoxValidator1::setDecimals(int decimals)
 {
     if (decimals != m_validator.decimals()) {
         m_validator.setDecimals(decimals);
@@ -135,12 +135,12 @@ void QQuickSpinBoxValidator::setDecimals(int decimals)
     }
 }
 
-qreal QQuickSpinBoxValidator::stepSize() const
+qreal QQuickSpinBoxValidator1::stepSize() const
 {
     return m_step;
 }
 
-void QQuickSpinBoxValidator::setStepSize(qreal step)
+void QQuickSpinBoxValidator1::setStepSize(qreal step)
 {
     if (m_step != step) {
         m_step = step;
@@ -148,12 +148,12 @@ void QQuickSpinBoxValidator::setStepSize(qreal step)
     }
 }
 
-QString QQuickSpinBoxValidator::prefix() const
+QString QQuickSpinBoxValidator1::prefix() const
 {
     return m_prefix;
 }
 
-void QQuickSpinBoxValidator::setPrefix(const QString &prefix)
+void QQuickSpinBoxValidator1::setPrefix(const QString &prefix)
 {
     if (m_prefix != prefix) {
         m_prefix = prefix;
@@ -161,12 +161,12 @@ void QQuickSpinBoxValidator::setPrefix(const QString &prefix)
     }
 }
 
-QString QQuickSpinBoxValidator::suffix() const
+QString QQuickSpinBoxValidator1::suffix() const
 {
     return m_suffix;
 }
 
-void QQuickSpinBoxValidator::setSuffix(const QString &suffix)
+void QQuickSpinBoxValidator1::setSuffix(const QString &suffix)
 {
     if (m_suffix != suffix) {
         m_suffix = suffix;
@@ -174,12 +174,12 @@ void QQuickSpinBoxValidator::setSuffix(const QString &suffix)
     }
 }
 
-void QQuickSpinBoxValidator::fixup(QString &input) const
+void QQuickSpinBoxValidator1::fixup(QString &input) const
 {
     input = textFromValue(m_value).remove(locale().groupSeparator());
 }
 
-QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) const
+QValidator::State QQuickSpinBoxValidator1::validate(QString &input, int &pos) const
 {
     if (pos > 0 && pos < input.length()) {
         if (input.at(pos - 1) == locale().groupSeparator())
@@ -209,7 +209,7 @@ QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) con
             if (state == QValidator::Acceptable ||
                (state == QValidator::Intermediate && val >= 0 && val <= m_validator.top()) ||
                (state == QValidator::Intermediate && val < 0 && val >= m_validator.bottom())) {
-                const_cast<QQuickSpinBoxValidator *>(this)->setValue(val);
+                const_cast<QQuickSpinBoxValidator1 *>(this)->setValue(val);
                 if (input != textFromValue(val))
                     state = QValidator::Intermediate;
             } else if (val < m_validator.bottom() || val > m_validator.top()) {
@@ -220,23 +220,23 @@ QValidator::State QQuickSpinBoxValidator::validate(QString &input, int &pos) con
     return state;
 }
 
-void QQuickSpinBoxValidator::componentComplete()
+void QQuickSpinBoxValidator1::componentComplete()
 {
     m_initialized = true;
     setValue(m_value);
 }
 
-void QQuickSpinBoxValidator::increment()
+void QQuickSpinBoxValidator1::increment()
 {
     setValue(m_value + m_step);
 }
 
-void QQuickSpinBoxValidator::decrement()
+void QQuickSpinBoxValidator1::decrement()
 {
     setValue(m_value - m_step);
 }
 
-QString QQuickSpinBoxValidator::textFromValue(qreal value) const
+QString QQuickSpinBoxValidator1::textFromValue(qreal value) const
 {
     return m_prefix + locale().toString(value, 'f', m_validator.decimals()) + m_suffix;
 }
diff --git a/src/controls/Private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h
index 8de18410..7ca6901e 100644
--- a/src/controls/Private/qquickspinboxvalidator_p.h
+++ b/src/controls/Private/qquickspinboxvalidator_p.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickSpinBoxValidator : public QValidator, public QQmlParserStatus
+class QQuickSpinBoxValidator1 : public QValidator, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
@@ -59,8 +59,8 @@ class QQuickSpinBoxValidator : public QValidator, public QQmlParserStatus
     Q_PROPERTY(QString suffix READ suffix WRITE setSuffix NOTIFY suffixChanged)
 
 public:
-    explicit QQuickSpinBoxValidator(QObject *parent = 0);
-    virtual ~QQuickSpinBoxValidator();
+    explicit QQuickSpinBoxValidator1(QObject *parent = 0);
+    virtual ~QQuickSpinBoxValidator1();
 
     QString text() const;
 
@@ -116,11 +116,11 @@ private:
     bool m_initialized;
     QDoubleValidator m_validator;
 
-    Q_DISABLE_COPY(QQuickSpinBoxValidator)
+    Q_DISABLE_COPY(QQuickSpinBoxValidator1)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickSpinBoxValidator)
+QML_DECLARE_TYPE(QQuickSpinBoxValidator1)
 
 #endif // QQUICKSPINBOXVALIDATOR_P_H
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index c3f579ab..79fba8be 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -96,10 +96,10 @@ CGContextRef qt_mac_cg_context(const QPaintDevice *pdev)
 
 #endif
 
-class QQuickStyleNode : public QSGNinePatchNode
+class QQuickStyleNode1 : public QSGNinePatchNode
 {
 public:
-    QQuickStyleNode()
+    QQuickStyleNode1()
         : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
     {
         m_geometry.setDrawingMode(GL_TRIANGLE_STRIP);
@@ -109,7 +109,7 @@ public:
         setMaterial(&m_material);
     }
 
-    ~QQuickStyleNode()
+    ~QQuickStyleNode1()
     {
         delete m_material.texture();
     }
@@ -212,7 +212,7 @@ public:
     QSGTextureMaterial m_material;
 };
 
-QQuickStyleItem::QQuickStyleItem(QQuickItem *parent)
+QQuickStyleItem1::QQuickStyleItem1(QQuickItem *parent)
     : QQuickItem(parent),
     m_styleoption(0),
     m_itemType(Undefined),
@@ -275,13 +275,13 @@ QQuickStyleItem::QQuickStyleItem(QQuickItem *parent)
     connect(this, SIGNAL(contentHeightChanged(int)), this, SLOT(updateBaselineOffset()));
 }
 
-QQuickStyleItem::~QQuickStyleItem()
+QQuickStyleItem1::~QQuickStyleItem1()
 {
     delete m_styleoption;
     m_styleoption = 0;
 }
 
-void QQuickStyleItem::initStyleOption()
+void QQuickStyleItem1::initStyleOption()
 {
     QString type = elementType();
     if (m_styleoption)
@@ -552,19 +552,19 @@ void QQuickStyleItem::initStyleOption()
         // For GTK style. See below, in setElementType()
         setProperty("_q_isComboBoxPopupItem", m_itemType == ComboBoxItem);
 
-        QQuickMenuItemType::MenuItemType type =
-                static_cast<QQuickMenuItemType::MenuItemType>(m_properties[QStringLiteral("type")].toInt());
-        if (type == QQuickMenuItemType::ScrollIndicator) {
+        QQuickMenuItemType1::MenuItemType type =
+                static_cast<QQuickMenuItemType1::MenuItemType>(m_properties[QStringLiteral("type")].toInt());
+        if (type == QQuickMenuItemType1::ScrollIndicator) {
             int scrollerDirection = m_properties[QStringLiteral("scrollerDirection")].toInt();
             opt->menuItemType = QStyleOptionMenuItem::Scroller;
             opt->state |= scrollerDirection == Qt::UpArrow ?
                         QStyle::State_UpArrow : QStyle::State_DownArrow;
-        } else if (type == QQuickMenuItemType::Separator) {
+        } else if (type == QQuickMenuItemType1::Separator) {
             opt->menuItemType = QStyleOptionMenuItem::Separator;
         } else {
             opt->text = text();
 
-            if (type == QQuickMenuItemType::Menu) {
+            if (type == QQuickMenuItemType1::Menu) {
                 opt->menuItemType = QStyleOptionMenuItem::SubMenu;
             } else {
                 opt->menuItemType = QStyleOptionMenuItem::Normal;
@@ -817,7 +817,7 @@ void QQuickStyleItem::initStyleOption()
 
 }
 
-void QQuickStyleItem::resolvePalette()
+void QQuickStyleItem1::resolvePalette()
 {
     if (QCoreApplication::testAttribute(Qt::AA_SetPalette))
         return;
@@ -886,7 +886,7 @@ void QQuickStyleItem::resolvePalette()
  *   QFusionStyle = "fusion"
  */
 
-QString QQuickStyleItem::style() const
+QString QQuickStyleItem1::style() const
 {
     QString style = qApp->style()->metaObject()->className();
     style = style.toLower();
@@ -897,7 +897,7 @@ QString QQuickStyleItem::style() const
     return style;
 }
 
-QString QQuickStyleItem::hitTest(int px, int py)
+QString QQuickStyleItem1::hitTest(int px, int py)
 {
     QStyle::SubControl subcontrol = QStyle::SC_All;
     switch (m_itemType) {
@@ -953,7 +953,7 @@ QString QQuickStyleItem::hitTest(int px, int py)
     return QStringLiteral("none");
 }
 
-QSize QQuickStyleItem::sizeFromContents(int width, int height)
+QSize QQuickStyleItem1::sizeFromContents(int width, int height)
 {
     initStyleOption();
 
@@ -1111,7 +1111,7 @@ QSize QQuickStyleItem::sizeFromContents(int width, int height)
     }    return size;
 }
 
-qreal QQuickStyleItem::baselineOffset()
+qreal QQuickStyleItem1::baselineOffset()
 {
     QRect r;
     bool ceilResult = true; // By default baseline offset rounding is done upwards
@@ -1172,14 +1172,14 @@ qreal QQuickStyleItem::baselineOffset()
     return 0.;
 }
 
-void QQuickStyleItem::updateBaselineOffset()
+void QQuickStyleItem1::updateBaselineOffset()
 {
     const qreal baseline = baselineOffset();
     if (baseline > 0)
         setBaselineOffset(baseline);
 }
 
-void QQuickStyleItem::setContentWidth(int arg)
+void QQuickStyleItem1::setContentWidth(int arg)
 {
     if (m_contentWidth != arg) {
         m_contentWidth = arg;
@@ -1187,7 +1187,7 @@ void QQuickStyleItem::setContentWidth(int arg)
     }
 }
 
-void QQuickStyleItem::setContentHeight(int arg)
+void QQuickStyleItem1::setContentHeight(int arg)
 {
     if (m_contentHeight != arg) {
         m_contentHeight = arg;
@@ -1195,20 +1195,20 @@ void QQuickStyleItem::setContentHeight(int arg)
     }
 }
 
-void QQuickStyleItem::updateSizeHint()
+void QQuickStyleItem1::updateSizeHint()
 {
     QSize implicitSize = sizeFromContents(m_contentWidth, m_contentHeight);
     setImplicitSize(implicitSize.width(), implicitSize.height());
 }
 
-void QQuickStyleItem::updateRect()
+void QQuickStyleItem1::updateRect()
 {
     initStyleOption();
     m_styleoption->rect.setWidth(width());
     m_styleoption->rect.setHeight(height());
 }
 
-int QQuickStyleItem::pixelMetric(const QString &metric)
+int QQuickStyleItem1::pixelMetric(const QString &metric)
 {
 
     if (metric == QLatin1String("scrollbarExtent"))
@@ -1256,7 +1256,7 @@ int QQuickStyleItem::pixelMetric(const QString &metric)
     return 0;
 }
 
-QVariant QQuickStyleItem::styleHint(const QString &metric)
+QVariant QQuickStyleItem1::styleHint(const QString &metric)
 {
     initStyleOption();
     if (metric == QLatin1String("comboboxpopup")) {
@@ -1289,7 +1289,7 @@ QVariant QQuickStyleItem::styleHint(const QString &metric)
     // Add SH_Menu_SpaceActivatesItem
 }
 
-void QQuickStyleItem::setHints(const QVariantMap &str)
+void QQuickStyleItem1::setHints(const QVariantMap &str)
 {
     if (m_hints != str) {
         m_hints = str;
@@ -1307,13 +1307,13 @@ void QQuickStyleItem::setHints(const QVariantMap &str)
     }
 }
 
-void QQuickStyleItem::resetHints()
+void QQuickStyleItem1::resetHints()
 {
     m_hints.clear();
 }
 
 
-void QQuickStyleItem::setElementType(const QString &str)
+void QQuickStyleItem1::setElementType(const QString &str)
 {
     if (m_type == str)
         return;
@@ -1404,7 +1404,7 @@ void QQuickStyleItem::setElementType(const QString &str)
     updateSizeHint();
 }
 
-QRectF QQuickStyleItem::subControlRect(const QString &subcontrolString)
+QRectF QQuickStyleItem1::subControlRect(const QString &subcontrolString)
 {
     QStyle::SubControl subcontrol = QStyle::SC_None;
     initStyleOption();
@@ -1468,9 +1468,9 @@ QRectF QQuickStyleItem::subControlRect(const QString &subcontrolString)
 }
 
 namespace  {
-class QHighDpiPixmapsEnabler {
+class QHighDpiPixmapsEnabler1 {
 public:
-    QHighDpiPixmapsEnabler()
+    QHighDpiPixmapsEnabler1()
     :wasEnabled(false)
     {
         if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps)) {
@@ -1479,7 +1479,7 @@ public:
         }
     }
 
-    ~QHighDpiPixmapsEnabler()
+    ~QHighDpiPixmapsEnabler1()
     {
         if (wasEnabled)
             qApp->setAttribute(Qt::AA_UseHighDpiPixmaps, false);
@@ -1489,7 +1489,7 @@ private:
 };
 }
 
-void QQuickStyleItem::paint(QPainter *painter)
+void QQuickStyleItem1::paint(QPainter *painter)
 {
     initStyleOption();
     if (QStyleOptionMenuItem *opt = qstyleoption_cast<QStyleOptionMenuItem*>(m_styleoption))
@@ -1506,7 +1506,7 @@ void QQuickStyleItem::paint(QPainter *painter)
     // Set AA_UseHighDpiPixmaps when calling style code to make QIcon return
     // "retina" pixmaps. The flag is controlled by the application so we can't
     // set it unconditinally.
-    QHighDpiPixmapsEnabler enabler;
+    QHighDpiPixmapsEnabler1 enabler;
 
     switch (m_itemType) {
     case Button:
@@ -1765,30 +1765,30 @@ void QQuickStyleItem::paint(QPainter *painter)
     }
 }
 
-qreal QQuickStyleItem::textWidth(const QString &text)
+qreal QQuickStyleItem1::textWidth(const QString &text)
 {
     QFontMetricsF fm = QFontMetricsF(m_styleoption->fontMetrics);
     return fm.boundingRect(text).width();
 }
 
-qreal QQuickStyleItem::textHeight(const QString &text)
+qreal QQuickStyleItem1::textHeight(const QString &text)
 {
     QFontMetricsF fm = QFontMetricsF(m_styleoption->fontMetrics);
     return text.isEmpty() ? fm.height() :
                             fm.boundingRect(text).height();
 }
 
-QString QQuickStyleItem::elidedText(const QString &text, int elideMode, int width)
+QString QQuickStyleItem1::elidedText(const QString &text, int elideMode, int width)
 {
     return m_styleoption->fontMetrics.elidedText(text, Qt::TextElideMode(elideMode), width);
 }
 
-bool QQuickStyleItem::hasThemeIcon(const QString &icon) const
+bool QQuickStyleItem1::hasThemeIcon(const QString &icon) const
 {
     return QIcon::hasThemeIcon(icon);
 }
 
-bool QQuickStyleItem::event(QEvent *ev)
+bool QQuickStyleItem1::event(QEvent *ev)
 {
     if (ev->type() == QEvent::StyleAnimationUpdate) {
         if (isVisible()) {
@@ -1803,7 +1803,7 @@ bool QQuickStyleItem::event(QEvent *ev)
     return QQuickItem::event(ev);
 }
 
-void QQuickStyleItem::setTextureWidth(int w)
+void QQuickStyleItem1::setTextureWidth(int w)
 {
     if (m_textureWidth == w)
         return;
@@ -1812,7 +1812,7 @@ void QQuickStyleItem::setTextureWidth(int w)
     update();
 }
 
-void QQuickStyleItem::setTextureHeight(int h)
+void QQuickStyleItem1::setTextureHeight(int h)
 {
     if (m_textureHeight == h)
         return;
@@ -1821,7 +1821,7 @@ void QQuickStyleItem::setTextureHeight(int h)
     update();
 }
 
-QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
+QSGNode *QQuickStyleItem1::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
 {
     if (m_image.isNull()) {
         delete node;
@@ -1832,7 +1832,7 @@ QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
     if (!styleNode) {
         styleNode = QQuickItemPrivate::get(this)->sceneGraphContext()->createNinePatchNode();
         if (!styleNode)
-            styleNode = new QQuickStyleNode;
+            styleNode = new QQuickStyleNode1;
     }
 
 #ifdef QSG_RUNTIME_DESCRIPTION
@@ -1852,7 +1852,7 @@ QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
     return styleNode;
 }
 
-void QQuickStyleItem::updatePolish()
+void QQuickStyleItem1::updatePolish()
 {
     if (width() >= 1 && height() >= 1) { // Note these are reals so 1 pixel is minimum
         float devicePixelRatio = window() ? window()->devicePixelRatio() : qApp->devicePixelRatio();
@@ -1871,7 +1871,7 @@ void QQuickStyleItem::updatePolish()
     }
 }
 
-QPixmap QQuickTableRowImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
+QPixmap QQuickTableRowImageProvider1::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
 {
     Q_UNUSED (requestedSize);
     int width = 16;
diff --git a/src/controls/Private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h
index 1cc27ca0..19cc15cf 100644
--- a/src/controls/Private/qquickstyleitem_p.h
+++ b/src/controls/Private/qquickstyleitem_p.h
@@ -50,19 +50,19 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 class QStyleOption;
 
-class QQuickTableRowImageProvider : public QQuickImageProvider
+class QQuickTableRowImageProvider1 : public QQuickImageProvider
 {
 public:
-    QQuickTableRowImageProvider()
+    QQuickTableRowImageProvider1()
         : QQuickImageProvider(QQuickImageProvider::Pixmap) {}
     QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
 };
 
-class QQuickStyleItem: public QQuickItem
+class QQuickStyleItem1: public QQuickItem
 {
     Q_OBJECT
 
-    Q_PROPERTY(QQuickPadding* border READ border CONSTANT)
+    Q_PROPERTY(QQuickPadding1* border READ border CONSTANT)
 
     Q_PROPERTY( bool sunken READ sunken WRITE setSunken NOTIFY sunkenChanged)
     Q_PROPERTY( bool raised READ raised WRITE setRaised NOTIFY raisedChanged)
@@ -95,11 +95,11 @@ class QQuickStyleItem: public QQuickItem
     Q_PROPERTY( int textureWidth READ textureWidth WRITE setTextureWidth NOTIFY textureWidthChanged)
     Q_PROPERTY( int textureHeight READ textureHeight WRITE setTextureHeight NOTIFY textureHeightChanged)
 
-    QQuickPadding* border() { return &m_border; }
+    QQuickPadding1* border() { return &m_border; }
 
 public:
-    QQuickStyleItem(QQuickItem *parent = 0);
-    ~QQuickStyleItem();
+    QQuickStyleItem1(QQuickItem *parent = 0);
+    ~QQuickStyleItem1();
 
     enum Type {
         Undefined,
@@ -289,7 +289,7 @@ protected:
     int m_textureHeight;
 
     QImage m_image;
-    QQuickPadding m_border;
+    QQuickPadding1 m_border;
 };
 
 QT_END_NAMESPACE
diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp
index 12a31381..aa09ea6b 100644
--- a/src/controls/Private/qquicktooltip.cpp
+++ b/src/controls/Private/qquicktooltip.cpp
@@ -50,13 +50,13 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickTooltip::QQuickTooltip(QObject *parent)
+QQuickTooltip1::QQuickTooltip1(QObject *parent)
     : QObject(parent)
 {
 
 }
 
-void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString &str)
+void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QString &str)
 {
     if (!item || !item->window())
         return;
@@ -78,7 +78,7 @@ void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString
 #endif
 }
 
-void QQuickTooltip::hideText()
+void QQuickTooltip1::hideText()
 {
 #ifdef QT_WIDGETS_LIB
     QToolTip::hideText();
diff --git a/src/controls/Private/qquicktooltip_p.h b/src/controls/Private/qquicktooltip_p.h
index 7ed57299..5b3cf919 100644
--- a/src/controls/Private/qquicktooltip_p.h
+++ b/src/controls/Private/qquicktooltip_p.h
@@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE
 class QPointF;
 class QQuickItem;
 
-class QQuickTooltip : public QObject
+class QQuickTooltip1 : public QObject
 {
     Q_OBJECT
 
 public:
-    QQuickTooltip(QObject *parent = 0);
+    QQuickTooltip1(QObject *parent = 0);
 
     Q_INVOKABLE void showText(QQuickItem *item, const QPointF &pos, const QString &text);
     Q_INVOKABLE void hideText();
diff --git a/src/controls/Private/qquicktreemodeladaptor.cpp b/src/controls/Private/qquicktreemodeladaptor.cpp
index e5a0aa2d..9c0dd71c 100644
--- a/src/controls/Private/qquicktreemodeladaptor.cpp
+++ b/src/controls/Private/qquicktreemodeladaptor.cpp
@@ -51,17 +51,17 @@ QT_BEGIN_NAMESPACE
 #   define ASSERT_CONSISTENCY qt_noop
 #endif
 
-QQuickTreeModelAdaptor::QQuickTreeModelAdaptor(QObject *parent) :
+QQuickTreeModelAdaptor1::QQuickTreeModelAdaptor1(QObject *parent) :
     QAbstractListModel(parent), m_model(0), m_lastItemIndex(0)
 {
 }
 
-QAbstractItemModel *QQuickTreeModelAdaptor::model() const
+QAbstractItemModel *QQuickTreeModelAdaptor1::model() const
 {
     return m_model;
 }
 
-void QQuickTreeModelAdaptor::setModel(QAbstractItemModel *arg)
+void QQuickTreeModelAdaptor1::setModel(QAbstractItemModel *arg)
 {
     struct Cx {
         const char *signal;
@@ -115,7 +115,7 @@ void QQuickTreeModelAdaptor::setModel(QAbstractItemModel *arg)
     }
 }
 
-void QQuickTreeModelAdaptor::clearModelData()
+void QQuickTreeModelAdaptor1::clearModelData()
 {
     beginResetModel();
     m_items.clear();
@@ -123,12 +123,12 @@ void QQuickTreeModelAdaptor::clearModelData()
     endResetModel();
 }
 
-const QModelIndex &QQuickTreeModelAdaptor::rootIndex() const
+const QModelIndex &QQuickTreeModelAdaptor1::rootIndex() const
 {
     return m_rootIndex;
 }
 
-void QQuickTreeModelAdaptor::setRootIndex(const QModelIndex &idx)
+void QQuickTreeModelAdaptor1::setRootIndex(const QModelIndex &idx)
 {
     if (m_rootIndex == idx)
         return;
@@ -141,12 +141,12 @@ void QQuickTreeModelAdaptor::setRootIndex(const QModelIndex &idx)
     emit rootIndexChanged();
 }
 
-void QQuickTreeModelAdaptor::resetRootIndex()
+void QQuickTreeModelAdaptor1::resetRootIndex()
 {
     setRootIndex(QModelIndex());
 }
 
-QHash<int, QByteArray> QQuickTreeModelAdaptor::roleNames() const
+QHash<int, QByteArray> QQuickTreeModelAdaptor1::roleNames() const
 {
     if (!m_model)
         return QHash<int, QByteArray>();
@@ -159,12 +159,12 @@ QHash<int, QByteArray> QQuickTreeModelAdaptor::roleNames() const
     return modelRoleNames;
 }
 
-int QQuickTreeModelAdaptor::rowCount(const QModelIndex &) const
+int QQuickTreeModelAdaptor1::rowCount(const QModelIndex &) const
 {
     return m_items.count();
 }
 
-QVariant QQuickTreeModelAdaptor::data(const QModelIndex &index, int role) const
+QVariant QQuickTreeModelAdaptor1::data(const QModelIndex &index, int role) const
 {
     if (!m_model)
         return QVariant();
@@ -185,7 +185,7 @@ QVariant QQuickTreeModelAdaptor::data(const QModelIndex &index, int role) const
     }
 }
 
-bool QQuickTreeModelAdaptor::setData(const QModelIndex &index, const QVariant &value, int role)
+bool QQuickTreeModelAdaptor1::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (!m_model)
         return false;
@@ -203,7 +203,7 @@ bool QQuickTreeModelAdaptor::setData(const QModelIndex &index, const QVariant &v
     }
 }
 
-int QQuickTreeModelAdaptor::itemIndex(const QModelIndex &index) const
+int QQuickTreeModelAdaptor1::itemIndex(const QModelIndex &index) const
 {
     // This is basically a plagiarism of QTreeViewPrivate::viewIndex()
     if (!index.isValid() || index == m_rootIndex || m_items.isEmpty())
@@ -245,23 +245,23 @@ int QQuickTreeModelAdaptor::itemIndex(const QModelIndex &index) const
     return -1;
 }
 
-bool QQuickTreeModelAdaptor::isVisible(const QModelIndex &index)
+bool QQuickTreeModelAdaptor1::isVisible(const QModelIndex &index)
 {
     return itemIndex(index) != -1;
 }
 
-bool QQuickTreeModelAdaptor::childrenVisible(const QModelIndex &index)
+bool QQuickTreeModelAdaptor1::childrenVisible(const QModelIndex &index)
 {
     return (index == m_rootIndex && !m_items.isEmpty())
            || (m_expandedItems.contains(index) && isVisible(index));
 }
 
-const QModelIndex &QQuickTreeModelAdaptor::mapToModel(const QModelIndex &index) const
+const QModelIndex &QQuickTreeModelAdaptor1::mapToModel(const QModelIndex &index) const
 {
     return m_items.at(index.row()).index;
 }
 
-QModelIndex QQuickTreeModelAdaptor::mapRowToModelIndex(int row) const
+QModelIndex QQuickTreeModelAdaptor1::mapRowToModelIndex(int row) const
 {
     if (!m_model)
         return QModelIndex();
@@ -270,7 +270,7 @@ QModelIndex QQuickTreeModelAdaptor::mapRowToModelIndex(int row) const
     return m_items.at(row).index;
 }
 
-QItemSelection  QQuickTreeModelAdaptor::selectionForRowRange(const QModelIndex &fromIndex, const QModelIndex &toIndex) const
+QItemSelection  QQuickTreeModelAdaptor1::selectionForRowRange(const QModelIndex &fromIndex, const QModelIndex &toIndex) const
 {
     int from = itemIndex(fromIndex);
     int to = itemIndex(toIndex);
@@ -323,7 +323,7 @@ QItemSelection  QQuickTreeModelAdaptor::selectionForRowRange(const QModelIndex &
     return sel;
 }
 
-void QQuickTreeModelAdaptor::showModelTopLevelItems(bool doInsertRows)
+void QQuickTreeModelAdaptor1::showModelTopLevelItems(bool doInsertRows)
 {
     if (!m_model)
         return;
@@ -337,7 +337,7 @@ void QQuickTreeModelAdaptor::showModelTopLevelItems(bool doInsertRows)
     showModelChildItems(TreeItem(m_rootIndex), 0, topLevelRowCount - 1, doInsertRows);
 }
 
-void QQuickTreeModelAdaptor::showModelChildItems(const TreeItem &parentItem, int start, int end, bool doInsertRows, bool doExpandPendingRows)
+void QQuickTreeModelAdaptor1::showModelChildItems(const TreeItem &parentItem, int start, int end, bool doInsertRows, bool doExpandPendingRows)
 {
     const QModelIndex &parentIndex = parentItem.index;
     int rowIdx = parentIndex.isValid() && parentIndex != m_rootIndex ? itemIndex(parentIndex) + 1 : 0;
@@ -379,7 +379,7 @@ void QQuickTreeModelAdaptor::showModelChildItems(const TreeItem &parentItem, int
 }
 
 
-void QQuickTreeModelAdaptor::expand(const QModelIndex &idx)
+void QQuickTreeModelAdaptor1::expand(const QModelIndex &idx)
 {
     ASSERT_CONSISTENCY();
     if (!m_model)
@@ -400,7 +400,7 @@ void QQuickTreeModelAdaptor::expand(const QModelIndex &idx)
     emit expanded(idx);
 }
 
-void QQuickTreeModelAdaptor::collapse(const QModelIndex &idx)
+void QQuickTreeModelAdaptor1::collapse(const QModelIndex &idx)
 {
     ASSERT_CONSISTENCY();
     if (!m_model)
@@ -421,7 +421,7 @@ void QQuickTreeModelAdaptor::collapse(const QModelIndex &idx)
     emit collapsed(idx);
 }
 
-bool QQuickTreeModelAdaptor::isExpanded(const QModelIndex &index) const
+bool QQuickTreeModelAdaptor1::isExpanded(const QModelIndex &index) const
 {
     ASSERT_CONSISTENCY();
     if (!m_model)
@@ -430,12 +430,12 @@ bool QQuickTreeModelAdaptor::isExpanded(const QModelIndex &index) const
     return !index.isValid() || m_expandedItems.contains(index);
 }
 
-bool QQuickTreeModelAdaptor::isExpanded(int row) const
+bool QQuickTreeModelAdaptor1::isExpanded(int row) const
 {
     return m_items.at(row).expanded;
 }
 
-void QQuickTreeModelAdaptor::expandRow(int n)
+void QQuickTreeModelAdaptor1::expandRow(int n)
 {
     if (!m_model || isExpanded(n))
         return;
@@ -452,7 +452,7 @@ void QQuickTreeModelAdaptor::expandRow(int n)
     expandPendingRows();
 }
 
-void QQuickTreeModelAdaptor::expandPendingRows(bool doInsertRows)
+void QQuickTreeModelAdaptor1::expandPendingRows(bool doInsertRows)
 {
     while (!m_itemsToExpand.isEmpty()) {
         TreeItem *item = m_itemsToExpand.takeFirst();
@@ -472,7 +472,7 @@ void QQuickTreeModelAdaptor::expandPendingRows(bool doInsertRows)
     }
 }
 
-void QQuickTreeModelAdaptor::collapseRow(int n)
+void QQuickTreeModelAdaptor1::collapseRow(int n)
 {
     if (!m_model || !isExpanded(n))
         return;
@@ -491,7 +491,7 @@ void QQuickTreeModelAdaptor::collapseRow(int n)
     removeVisibleRows(n + 1, lastIndex);
 }
 
-int QQuickTreeModelAdaptor::lastChildIndex(const QModelIndex &index)
+int QQuickTreeModelAdaptor1::lastChildIndex(const QModelIndex &index)
 {
     if (!m_expandedItems.contains(index))
         return itemIndex(index);
@@ -509,7 +509,7 @@ int QQuickTreeModelAdaptor::lastChildIndex(const QModelIndex &index)
     return firstIndex - 1;
 }
 
-void QQuickTreeModelAdaptor::removeVisibleRows(int startIndex, int endIndex, bool doRemoveRows)
+void QQuickTreeModelAdaptor1::removeVisibleRows(int startIndex, int endIndex, bool doRemoveRows)
 {
     if (startIndex < 0 || endIndex < 0 || startIndex > endIndex)
         return;
@@ -521,14 +521,14 @@ void QQuickTreeModelAdaptor::removeVisibleRows(int startIndex, int endIndex, boo
         endRemoveRows();
 }
 
-void QQuickTreeModelAdaptor::modelHasBeenDestroyed()
+void QQuickTreeModelAdaptor1::modelHasBeenDestroyed()
 {
     // The model has been deleted. This should behave as if no model was set
     clearModelData();
     emit modelChanged(Q_NULLPTR);
 }
 
-void QQuickTreeModelAdaptor::modelHasBeenReset()
+void QQuickTreeModelAdaptor1::modelHasBeenReset()
 {
     clearModelData();
 
@@ -536,7 +536,7 @@ void QQuickTreeModelAdaptor::modelHasBeenReset()
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRigth, const QVector<int> &roles)
+void QQuickTreeModelAdaptor1::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRigth, const QVector<int> &roles)
 {
     Q_ASSERT(topLeft.parent() == bottomRigth.parent());
     const QModelIndex &parent = topLeft.parent();
@@ -574,14 +574,14 @@ void QQuickTreeModelAdaptor::modelDataChanged(const QModelIndex &topLeft, const
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::modelLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
+void QQuickTreeModelAdaptor1::modelLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
 {
     ASSERT_CONSISTENCY();
     Q_UNUSED(parents);
     Q_UNUSED(hint);
 }
 
-void QQuickTreeModelAdaptor::modelLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
+void QQuickTreeModelAdaptor1::modelLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
 {
     Q_UNUSED(hint);
     if (parents.isEmpty()) {
@@ -608,7 +608,7 @@ void QQuickTreeModelAdaptor::modelLayoutChanged(const QList<QPersistentModelInde
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::modelRowsAboutToBeInserted(const QModelIndex & parent, int start, int end)
+void QQuickTreeModelAdaptor1::modelRowsAboutToBeInserted(const QModelIndex & parent, int start, int end)
 {
     Q_UNUSED(parent);
     Q_UNUSED(start);
@@ -616,7 +616,7 @@ void QQuickTreeModelAdaptor::modelRowsAboutToBeInserted(const QModelIndex & pare
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::modelRowsInserted(const QModelIndex & parent, int start, int end)
+void QQuickTreeModelAdaptor1::modelRowsInserted(const QModelIndex & parent, int start, int end)
 {
     TreeItem item;
     int parentRow = itemIndex(parent);
@@ -639,7 +639,7 @@ void QQuickTreeModelAdaptor::modelRowsInserted(const QModelIndex & parent, int s
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::modelRowsAboutToBeRemoved(const QModelIndex & parent, int start, int end)
+void QQuickTreeModelAdaptor1::modelRowsAboutToBeRemoved(const QModelIndex & parent, int start, int end)
 {
     ASSERT_CONSISTENCY();
     if (parent == m_rootIndex || childrenVisible(parent)) {
@@ -666,7 +666,7 @@ void QQuickTreeModelAdaptor::modelRowsAboutToBeRemoved(const QModelIndex & paren
     }
 }
 
-void QQuickTreeModelAdaptor::modelRowsRemoved(const QModelIndex & parent, int start, int end)
+void QQuickTreeModelAdaptor1::modelRowsRemoved(const QModelIndex & parent, int start, int end)
 {
     Q_UNUSED(start);
     Q_UNUSED(end);
@@ -679,7 +679,7 @@ void QQuickTreeModelAdaptor::modelRowsRemoved(const QModelIndex & parent, int st
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::modelRowsAboutToBeMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow)
+void QQuickTreeModelAdaptor1::modelRowsAboutToBeMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow)
 {
     ASSERT_CONSISTENCY();
     if (!childrenVisible(sourceParent))
@@ -743,14 +743,14 @@ void QQuickTreeModelAdaptor::modelRowsAboutToBeMoved(const QModelIndex & sourceP
     }
 }
 
-void QQuickTreeModelAdaptor::modelRowsMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow)
+void QQuickTreeModelAdaptor1::modelRowsMoved(const QModelIndex & sourceParent, int sourceStart, int sourceEnd, const QModelIndex & destinationParent, int destinationRow)
 {
     if (!childrenVisible(sourceParent) && childrenVisible(destinationParent))
         modelRowsInserted(destinationParent, destinationRow, destinationRow + sourceEnd - sourceStart);
     ASSERT_CONSISTENCY();
 }
 
-void QQuickTreeModelAdaptor::dump() const
+void QQuickTreeModelAdaptor1::dump() const
 {
     if (!m_model)
         return;
@@ -770,7 +770,7 @@ void QQuickTreeModelAdaptor::dump() const
     }
 }
 
-bool QQuickTreeModelAdaptor::testConsistency(bool dumpOnFail) const
+bool QQuickTreeModelAdaptor1::testConsistency(bool dumpOnFail) const
 {
     if (!m_model) {
         if (!m_items.isEmpty()) {
diff --git a/src/controls/Private/qquicktreemodeladaptor_p.h b/src/controls/Private/qquicktreemodeladaptor_p.h
index 23d4bb37..ddad96cb 100644
--- a/src/controls/Private/qquicktreemodeladaptor_p.h
+++ b/src/controls/Private/qquicktreemodeladaptor_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QAbstractItemModel;
 
-class QQuickTreeModelAdaptor : public QAbstractListModel
+class QQuickTreeModelAdaptor1 : public QAbstractListModel
 {
     Q_OBJECT
     Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)
@@ -69,7 +69,7 @@ class QQuickTreeModelAdaptor : public QAbstractListModel
     struct TreeItem;
 
 public:
-    explicit QQuickTreeModelAdaptor(QObject *parent = 0);
+    explicit QQuickTreeModelAdaptor1(QObject *parent = 0);
 
     QAbstractItemModel *model() const;
     const QModelIndex &rootIndex() const;
diff --git a/src/controls/Private/qquickwheelarea.cpp b/src/controls/Private/qquickwheelarea.cpp
index 2afddf3e..9c0a70a2 100644
--- a/src/controls/Private/qquickwheelarea.cpp
+++ b/src/controls/Private/qquickwheelarea.cpp
@@ -54,7 +54,7 @@ static const qreal pixelDeltaAdjustment = 0.5;
 // comes originally from QTextEdit, which sets 20px steps by default.
 static const qreal defaultScrollSpeed = 20.0;
 
-QQuickWheelArea::QQuickWheelArea(QQuickItem *parent)
+QQuickWheelArea1::QQuickWheelArea1(QQuickItem *parent)
     : QQuickItem(parent),
       m_horizontalMinimumValue(0),
       m_horizontalMaximumValue(0),
@@ -70,38 +70,38 @@ QQuickWheelArea::QQuickWheelArea(QQuickItem *parent)
 
 }
 
-QQuickWheelArea::~QQuickWheelArea()
+QQuickWheelArea1::~QQuickWheelArea1()
 {
 
 }
 
-bool QQuickWheelArea::isAtXEnd() const
+bool QQuickWheelArea1::isAtXEnd() const
 {
     return qFuzzyCompare(m_horizontalMaximumValue, m_horizontalValue);
 }
 
-bool QQuickWheelArea::isAtXBeginning() const
+bool QQuickWheelArea1::isAtXBeginning() const
 {
     return qFuzzyCompare(m_horizontalMinimumValue, m_horizontalValue);
 }
 
-bool QQuickWheelArea::isAtYEnd() const
+bool QQuickWheelArea1::isAtYEnd() const
 {
     return qFuzzyCompare(m_verticalMaximumValue, m_verticalValue);
 }
 
-bool QQuickWheelArea::isAtYBeginning() const
+bool QQuickWheelArea1::isAtYBeginning() const
 {
     return qFuzzyCompare(m_verticalMinimumValue, m_verticalValue);
 }
 
-bool QQuickWheelArea::isInverted() const
+bool QQuickWheelArea1::isInverted() const
 {
     return m_inverted;
 }
 
 #ifndef QT_NO_WHEELEVENT
-void QQuickWheelArea::wheelEvent(QWheelEvent *we)
+void QQuickWheelArea1::wheelEvent(QWheelEvent *we)
 {
     if (we->phase() == Qt::ScrollBegin)
         setActive(true);
@@ -139,47 +139,47 @@ void QQuickWheelArea::wheelEvent(QWheelEvent *we)
 }
 #endif
 
-void QQuickWheelArea::setHorizontalMinimumValue(qreal value)
+void QQuickWheelArea1::setHorizontalMinimumValue(qreal value)
 {
     m_horizontalMinimumValue = value;
 }
 
-qreal QQuickWheelArea::horizontalMinimumValue() const
+qreal QQuickWheelArea1::horizontalMinimumValue() const
 {
     return m_horizontalMinimumValue;
 }
 
-void QQuickWheelArea::setHorizontalMaximumValue(qreal value)
+void QQuickWheelArea1::setHorizontalMaximumValue(qreal value)
 {
     m_horizontalMaximumValue = value;
 }
 
-qreal QQuickWheelArea::horizontalMaximumValue() const
+qreal QQuickWheelArea1::horizontalMaximumValue() const
 {
     return m_horizontalMaximumValue;
 }
 
-void QQuickWheelArea::setVerticalMinimumValue(qreal value)
+void QQuickWheelArea1::setVerticalMinimumValue(qreal value)
 {
     m_verticalMinimumValue = value;
 }
 
-qreal QQuickWheelArea::verticalMinimumValue() const
+qreal QQuickWheelArea1::verticalMinimumValue() const
 {
     return m_verticalMinimumValue;
 }
 
-void QQuickWheelArea::setVerticalMaximumValue(qreal value)
+void QQuickWheelArea1::setVerticalMaximumValue(qreal value)
 {
     m_verticalMaximumValue = value;
 }
 
-qreal QQuickWheelArea::verticalMaximumValue() const
+qreal QQuickWheelArea1::verticalMaximumValue() const
 {
     return m_verticalMaximumValue;
 }
 
-void QQuickWheelArea::setHorizontalValue(qreal value)
+void QQuickWheelArea1::setHorizontalValue(qreal value)
 {
     value = qBound<qreal>(m_horizontalMinimumValue, value, m_horizontalMaximumValue);
 
@@ -189,12 +189,12 @@ void QQuickWheelArea::setHorizontalValue(qreal value)
     }
 }
 
-qreal QQuickWheelArea::horizontalValue() const
+qreal QQuickWheelArea1::horizontalValue() const
 {
     return m_horizontalValue;
 }
 
-void QQuickWheelArea::setVerticalValue(qreal value)
+void QQuickWheelArea1::setVerticalValue(qreal value)
 {
     value = qBound<qreal>(m_verticalMinimumValue, value, m_verticalMaximumValue);
 
@@ -204,12 +204,12 @@ void QQuickWheelArea::setVerticalValue(qreal value)
     }
 }
 
-qreal QQuickWheelArea::verticalValue() const
+qreal QQuickWheelArea1::verticalValue() const
 {
     return m_verticalValue;
 }
 
-void QQuickWheelArea::setVerticalDelta(qreal value)
+void QQuickWheelArea1::setVerticalDelta(qreal value)
 {
     m_verticalDelta = value;
     setVerticalValue(m_verticalValue - m_verticalDelta);
@@ -217,12 +217,12 @@ void QQuickWheelArea::setVerticalDelta(qreal value)
     emit verticalWheelMoved();
 }
 
-qreal QQuickWheelArea::verticalDelta() const
+qreal QQuickWheelArea1::verticalDelta() const
 {
     return m_verticalDelta;
 }
 
-void QQuickWheelArea::setHorizontalDelta(qreal value)
+void QQuickWheelArea1::setHorizontalDelta(qreal value)
 {
     m_horizontalDelta = value;
     setHorizontalValue(m_horizontalValue - m_horizontalDelta);
@@ -230,12 +230,12 @@ void QQuickWheelArea::setHorizontalDelta(qreal value)
     emit horizontalWheelMoved();
 }
 
-qreal QQuickWheelArea::horizontalDelta() const
+qreal QQuickWheelArea1::horizontalDelta() const
 {
     return m_horizontalDelta;
 }
 
-void QQuickWheelArea::setScrollSpeed(qreal value)
+void QQuickWheelArea1::setScrollSpeed(qreal value)
 {
     if (value != m_scrollSpeed) {
         m_scrollSpeed = value;
@@ -243,17 +243,17 @@ void QQuickWheelArea::setScrollSpeed(qreal value)
     }
 }
 
-qreal QQuickWheelArea::scrollSpeed() const
+qreal QQuickWheelArea1::scrollSpeed() const
 {
     return m_scrollSpeed;
 }
 
-bool QQuickWheelArea::isActive() const
+bool QQuickWheelArea1::isActive() const
 {
     return m_active;
 }
 
-void QQuickWheelArea::setActive(bool active)
+void QQuickWheelArea1::setActive(bool active)
 {
     if (active != m_active) {
         m_active = active;
diff --git a/src/controls/Private/qquickwheelarea_p.h b/src/controls/Private/qquickwheelarea_p.h
index 077b24d4..676383bc 100644
--- a/src/controls/Private/qquickwheelarea_p.h
+++ b/src/controls/Private/qquickwheelarea_p.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickWheelArea : public QQuickItem
+class QQuickWheelArea1 : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal verticalDelta READ verticalDelta WRITE setVerticalDelta NOTIFY verticalWheelMoved)
@@ -61,8 +61,8 @@ class QQuickWheelArea : public QQuickItem
     Q_PROPERTY(bool inverted READ isInverted)
 
 public:
-    QQuickWheelArea(QQuickItem *parent = 0);
-    virtual ~QQuickWheelArea();
+    QQuickWheelArea1(QQuickItem *parent = 0);
+    virtual ~QQuickWheelArea1();
 
     void setHorizontalMinimumValue(qreal value);
     qreal horizontalMinimumValue() const;
@@ -125,11 +125,11 @@ private:
     bool m_active;
     bool m_inverted;
 
-    Q_DISABLE_COPY(QQuickWheelArea)
+    Q_DISABLE_COPY(QQuickWheelArea1)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickWheelArea)
+QML_DECLARE_TYPE(QQuickWheelArea1)
 
 #endif // QQUICKWHEELAREA_P_H