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/Private/qquickcalendarmodel_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/Private/qquickcalendarmodel_p.h')
| -rw-r--r-- | src/controls/Private/qquickcalendarmodel_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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. |