diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-03 12:31:08 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-03 12:35:32 +0000 |
| commit | c8337d9779b87bc427842a9617179aca3b869d0a (patch) | |
| tree | 218a5e353b96aa0a36b2453321f072617f1613e5 /src/controls/qquickexclusivegroup_p.h | |
| parent | 1adb58bb6d31234dc9e05ce95b60aa1be7c75373 (diff) | |
| download | qtquickcontrols-c8337d9779b87bc427842a9617179aca3b869d0a.tar.gz | |
Rename QQuickExclusiveGroup to QQuickExclusiveGroup1
This avoids clashes between Qt Quick Controls and Qt Labs Controls.
No other classes have this problem, as this is the only
class with the same name as that of one in Qt Labs Controls.
Change-Id: I6223e6b42654330abda7942dc5c7a2b3ad942b70
Task-number: QTBUG-48240
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickexclusivegroup_p.h')
| -rw-r--r-- | src/controls/qquickexclusivegroup_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/qquickexclusivegroup_p.h b/src/controls/qquickexclusivegroup_p.h index 05256dcf..835bdb5e 100644 --- a/src/controls/qquickexclusivegroup_p.h +++ b/src/controls/qquickexclusivegroup_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QQUICKEXCLUSIVEGROUP_H -#define QQUICKEXCLUSIVEGROUP_H +#ifndef QQUICKEXCLUSIVEGROUP1_H +#define QQUICKEXCLUSIVEGROUP1_H #include <QtCore/qobject.h> #include <QtCore/qmetaobject.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE class QQuickAction; -class QQuickExclusiveGroup : public QObject +class QQuickExclusiveGroup1 : public QObject { Q_OBJECT @@ -54,7 +54,7 @@ class QQuickExclusiveGroup : public QObject Q_CLASSINFO("DefaultProperty", "__actions") public: - explicit QQuickExclusiveGroup(QObject *parent = 0); + explicit QQuickExclusiveGroup1(QObject *parent = 0); QObject *current() const { return m_current; } void setCurrent(QObject * o); @@ -80,4 +80,4 @@ private: QT_END_NAMESPACE -#endif // QQUICKEXCLUSIVEGROUP_H +#endif // QQUICKEXCLUSIVEGROUP1_H |