diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-17 16:34:58 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-18 08:12:15 +0000 |
commit | 5cf6ad9165cc38b7b2a7e2421d70f0d93256c866 (patch) | |
tree | 09f63a49f570bc5f4d3b3a922c4112a1d2ab37d1 /src/controls/qquickstack_p.h | |
parent | 463b8d7bb53ae5ea08ec6caafdf1754ca015603a (diff) | |
download | qtquickcontrols-5cf6ad9165cc38b7b2a7e2421d70f0d93256c866.tar.gz |
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>
Diffstat (limited to 'src/controls/qquickstack_p.h')
-rw-r--r-- | src/controls/qquickstack_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/qquickstack_p.h b/src/controls/qquickstack_p.h index 5df1e9fb..5dabca6b 100644 --- a/src/controls/qquickstack_p.h +++ b/src/controls/qquickstack_p.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -class QQuickStack : public QObject +class QQuickStack1 : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged) @@ -56,9 +56,9 @@ class QQuickStack : public QObject Q_ENUMS(Status) public: - QQuickStack(QObject *object = 0); + QQuickStack1(QObject *object = 0); - static QQuickStack *qmlAttachedProperties(QObject *object); + static QQuickStack1 *qmlAttachedProperties(QObject *object); int index() const; void setIndex(int index); @@ -89,7 +89,7 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStack) -QML_DECLARE_TYPEINFO(QQuickStack, QML_HAS_ATTACHED_PROPERTIES) +QML_DECLARE_TYPE(QQuickStack1) +QML_DECLARE_TYPEINFO(QQuickStack1, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKSTACK_P_H |