5 files changed, 44 insertions, 44 deletions
diff --git a/src/controls/Styles/Android/plugin.cpp b/src/controls/Styles/Android/plugin.cpp
index 0454c40d2..5656b83d7 100644
--- a/src/controls/Styles/Android/plugin.cpp
+++ b/src/controls/Styles/Android/plugin.cpp
@@ -53,20 +53,20 @@ static void initResources()
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickControlsAndroidStylePlugin: public QQmlExtensionPlugin
+class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    QtQuickControlsAndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
     void registerTypes(const char *uri);
 };
 
-void QtQuickControlsAndroidStylePlugin::registerTypes(const char *uri)
+void QtQuickControls1AndroidStylePlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QQuickAndroid9Patch>(uri, 1, 0, "Android9Patch");
-    qmlRegisterType<QQuickAndroidStyle>(uri, 1, 0, "AndroidStyleBase");
+    qmlRegisterType<QQuickAndroid9Patch1>(uri, 1, 0, "Android9Patch");
+    qmlRegisterType<QQuickAndroidStyle1>(uri, 1, 0, "AndroidStyleBase");
 }
 
 QT_END_NAMESPACE
diff --git a/src/controls/Styles/Android/qquickandroid9patch.cpp b/src/controls/Styles/Android/qquickandroid9patch.cpp
index 156197e21..48e86baa7 100644
--- a/src/controls/Styles/Android/qquickandroid9patch.cpp
+++ b/src/controls/Styles/Android/qquickandroid9patch.cpp
@@ -43,21 +43,21 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAndroid9PatchNode : public QSGGeometryNode
+class QQuickAndroid9PatchNode1 : public QSGGeometryNode
 {
 public:
-    QQuickAndroid9PatchNode();
-    ~QQuickAndroid9PatchNode();
+    QQuickAndroid9PatchNode1();
+    ~QQuickAndroid9PatchNode1();
 
     void initialize(QSGTexture *texture, const QRectF &bounds, const QSize &sourceSize,
-                    const QQuickAndroid9PatchDivs &xDivs, const QQuickAndroid9PatchDivs &yDivs);
+                    const QQuickAndroid9PatchDivs1 &xDivs, const QQuickAndroid9PatchDivs1 &yDivs);
 
 private:
     QSGGeometry m_geometry;
     QSGTextureMaterial m_material;
 };
 
-QQuickAndroid9PatchNode::QQuickAndroid9PatchNode()
+QQuickAndroid9PatchNode1::QQuickAndroid9PatchNode1()
     : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
 {
     m_geometry.setDrawingMode(GL_TRIANGLES);
@@ -65,13 +65,13 @@ QQuickAndroid9PatchNode::QQuickAndroid9PatchNode()
     setMaterial(&m_material);
 }
 
-QQuickAndroid9PatchNode::~QQuickAndroid9PatchNode()
+QQuickAndroid9PatchNode1::~QQuickAndroid9PatchNode1()
 {
     delete m_material.texture();
 }
 
-void QQuickAndroid9PatchNode::initialize(QSGTexture *texture, const QRectF &bounds, const QSize &sourceSize,
-                                         const QQuickAndroid9PatchDivs &xDivs, const QQuickAndroid9PatchDivs &yDivs)
+void QQuickAndroid9PatchNode1::initialize(QSGTexture *texture, const QRectF &bounds, const QSize &sourceSize,
+                                         const QQuickAndroid9PatchDivs1 &xDivs, const QQuickAndroid9PatchDivs1 &yDivs)
 {
     delete m_material.texture();
     m_material.setTexture(texture);
@@ -115,7 +115,7 @@ void QQuickAndroid9PatchNode::initialize(QSGTexture *texture, const QRectF &boun
     markDirty(QSGNode::DirtyGeometry | QSGNode::DirtyMaterial);
 }
 
-QVector<qreal> QQuickAndroid9PatchDivs::coordsForSize(qreal size) const
+QVector<qreal> QQuickAndroid9PatchDivs1::coordsForSize(qreal size) const
 {
     // n = number of stretchable sections
     // We have to compensate when adding 0 and/or
@@ -141,7 +141,7 @@ QVector<qreal> QQuickAndroid9PatchDivs::coordsForSize(qreal size) const
     return coords;
 }
 
-void QQuickAndroid9PatchDivs::fill(const QVariantList &divs, qreal size)
+void QQuickAndroid9PatchDivs1::fill(const QVariantList &divs, qreal size)
 {
     if (!data.isEmpty())
         return;
@@ -161,27 +161,27 @@ void QQuickAndroid9PatchDivs::fill(const QVariantList &divs, qreal size)
     data.append(size);
 }
 
-void QQuickAndroid9PatchDivs::clear()
+void QQuickAndroid9PatchDivs1::clear()
 {
     data.clear();
 }
 
-QQuickAndroid9Patch::QQuickAndroid9Patch(QQuickItem *parent) : QQuickItem(parent)
+QQuickAndroid9Patch1::QQuickAndroid9Patch1(QQuickItem *parent) : QQuickItem(parent)
 {
     connect(this, SIGNAL(widthChanged()), this, SLOT(updateDivs()));
     connect(this, SIGNAL(heightChanged()), this, SLOT(updateDivs()));
 }
 
-QQuickAndroid9Patch::~QQuickAndroid9Patch()
+QQuickAndroid9Patch1::~QQuickAndroid9Patch1()
 {
 }
 
-QUrl QQuickAndroid9Patch::source() const
+QUrl QQuickAndroid9Patch1::source() const
 {
     return m_source;
 }
 
-void QQuickAndroid9Patch::setSource(const QUrl &source)
+void QQuickAndroid9Patch1::setSource(const QUrl &source)
 {
     if (m_source != source) {
         m_source = source;
@@ -195,12 +195,12 @@ void QQuickAndroid9Patch::setSource(const QUrl &source)
     }
 }
 
-QVariantList QQuickAndroid9Patch::xDivs() const
+QVariantList QQuickAndroid9Patch1::xDivs() const
 {
     return m_xVars;
 }
 
-void QQuickAndroid9Patch::setXDivs(const QVariantList &divs)
+void QQuickAndroid9Patch1::setXDivs(const QVariantList &divs)
 {
     if (m_xVars != divs) {
         m_xVars = divs;
@@ -211,12 +211,12 @@ void QQuickAndroid9Patch::setXDivs(const QVariantList &divs)
     }
 }
 
-QVariantList QQuickAndroid9Patch::yDivs() const
+QVariantList QQuickAndroid9Patch1::yDivs() const
 {
     return m_yVars;
 }
 
-void QQuickAndroid9Patch::setYDivs(const QVariantList &divs)
+void QQuickAndroid9Patch1::setYDivs(const QVariantList &divs)
 {
     if (m_yVars != divs) {
         m_yVars = divs;
@@ -227,23 +227,23 @@ void QQuickAndroid9Patch::setYDivs(const QVariantList &divs)
     }
 }
 
-QSize QQuickAndroid9Patch::sourceSize() const
+QSize QQuickAndroid9Patch1::sourceSize() const
 {
     return m_sourceSize;
 }
 
-void QQuickAndroid9Patch::classBegin()
+void QQuickAndroid9Patch1::classBegin()
 {
     QQuickItem::classBegin();
 }
 
-void QQuickAndroid9Patch::componentComplete()
+void QQuickAndroid9Patch1::componentComplete()
 {
     QQuickItem::componentComplete();
     loadImage();
 }
 
-QSGNode *QQuickAndroid9Patch::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data)
+QSGNode *QQuickAndroid9Patch1::updatePaintNode(QSGNode *node, UpdatePaintNodeData *data)
 {
     Q_UNUSED(data);
 
@@ -252,9 +252,9 @@ QSGNode *QQuickAndroid9Patch::updatePaintNode(QSGNode *node, UpdatePaintNodeData
         return 0;
     }
 
-    QQuickAndroid9PatchNode *patchNode = static_cast<QQuickAndroid9PatchNode *>(node);
+    QQuickAndroid9PatchNode1 *patchNode = static_cast<QQuickAndroid9PatchNode1 *>(node);
     if (!patchNode)
-        patchNode = new QQuickAndroid9PatchNode;
+        patchNode = new QQuickAndroid9PatchNode1;
 
 #ifdef QSG_RUNTIME_DESCRIPTION
     qsgnode_set_description(patchNode, QString::fromLatin1("Android9Patch: '%1'").arg(m_source.toString()));
@@ -265,7 +265,7 @@ QSGNode *QQuickAndroid9Patch::updatePaintNode(QSGNode *node, UpdatePaintNodeData
     return patchNode;
 }
 
-void QQuickAndroid9Patch::loadImage()
+void QQuickAndroid9Patch1::loadImage()
 {
     if (!isComponentComplete())
         return;
@@ -281,7 +281,7 @@ void QQuickAndroid9Patch::loadImage()
     updateDivs();
 }
 
-void QQuickAndroid9Patch::updateDivs()
+void QQuickAndroid9Patch1::updateDivs()
 {
     if (!isComponentComplete() || m_image.isNull() || width() <= 0 || height() <= 0)
         return;
diff --git a/src/controls/Styles/Android/qquickandroid9patch_p.h b/src/controls/Styles/Android/qquickandroid9patch_p.h
index 31f594088..8d0c2a7b2 100644
--- a/src/controls/Styles/Android/qquickandroid9patch_p.h
+++ b/src/controls/Styles/Android/qquickandroid9patch_p.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QQuickAndroid9PatchDivs
+struct QQuickAndroid9PatchDivs1
 {
     QVector<qreal> coordsForSize(qreal size) const;
 
@@ -57,7 +57,7 @@ struct QQuickAndroid9PatchDivs
     QVector<qreal> data;
 };
 
-class QQuickAndroid9Patch : public QQuickItem
+class QQuickAndroid9Patch1 : public QQuickItem
 {
     Q_OBJECT
 
@@ -67,8 +67,8 @@ class QQuickAndroid9Patch : public QQuickItem
     Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged FINAL)
 
 public:
-    explicit QQuickAndroid9Patch(QQuickItem *parent = 0);
-    ~QQuickAndroid9Patch();
+    explicit QQuickAndroid9Patch1(QQuickItem *parent = 0);
+    ~QQuickAndroid9Patch1();
 
     QUrl source() const;
     QVariantList xDivs() const;
@@ -101,8 +101,8 @@ private:
     QSize m_sourceSize;
     QVariantList m_xVars;
     QVariantList m_yVars;
-    QQuickAndroid9PatchDivs m_xDivs;
-    QQuickAndroid9PatchDivs m_yDivs;
+    QQuickAndroid9PatchDivs1 m_xDivs;
+    QQuickAndroid9PatchDivs1 m_yDivs;
 };
 
 QT_END_NAMESPACE
diff --git a/src/controls/Styles/Android/qquickandroidstyle.cpp b/src/controls/Styles/Android/qquickandroidstyle.cpp
index 41f3113c2..0c57d795a 100644
--- a/src/controls/Styles/Android/qquickandroidstyle.cpp
+++ b/src/controls/Styles/Android/qquickandroidstyle.cpp
@@ -73,26 +73,26 @@ static QString resolvePath()
     return stylePath;
 }
 
-QQuickAndroidStyle::QQuickAndroidStyle(QObject *parent) : QObject(parent)
+QQuickAndroidStyle1::QQuickAndroidStyle1(QObject *parent) : QObject(parent)
 {
     m_path = resolvePath();
 }
 
-QByteArray QQuickAndroidStyle::data() const
+QByteArray QQuickAndroidStyle1::data() const
 {
     if (m_data.isNull() && !m_path.isNull())
         m_data = readFile(m_path + QLatin1String("style.json"));
     return m_data;
 }
 
-QString QQuickAndroidStyle::filePath(const QString &fileName) const
+QString QQuickAndroidStyle1::filePath(const QString &fileName) const
 {
     if (!fileName.isEmpty())
         return m_path + QFileInfo(fileName).fileName();
     return QString();
 }
 
-QColor QQuickAndroidStyle::colorValue(uint value) const
+QColor QQuickAndroidStyle1::colorValue(uint value) const
 {
     return QColor::fromRgba(value);
 }
diff --git a/src/controls/Styles/Android/qquickandroidstyle_p.h b/src/controls/Styles/Android/qquickandroidstyle_p.h
index bda37d6ab..6911eb8d0 100644
--- a/src/controls/Styles/Android/qquickandroidstyle_p.h
+++ b/src/controls/Styles/Android/qquickandroidstyle_p.h
@@ -45,14 +45,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAndroidStyle : public QObject
+class QQuickAndroidStyle1 : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray data READ data CONSTANT FINAL)
     Q_ENUMS(Gravity)
 
 public:
-    QQuickAndroidStyle(QObject *parent = 0);
+    QQuickAndroidStyle1(QObject *parent = 0);
 
     QByteArray data() const;