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/qquickaction.cpp | |
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/qquickaction.cpp')
-rw-r--r-- | src/controls/qquickaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index 6add916d..47032aab 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -392,12 +392,12 @@ void QQuickAction::setChecked(bool c) emit toggled(m_checked); } -QQuickExclusiveGroup *QQuickAction::exclusiveGroup() const +QQuickExclusiveGroup1 *QQuickAction::exclusiveGroup() const { return m_exclusiveGroup.data(); } -void QQuickAction::setExclusiveGroup(QQuickExclusiveGroup *eg) +void QQuickAction::setExclusiveGroup(QQuickExclusiveGroup1 *eg) { if (m_exclusiveGroup == eg) return; |