aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/calendar/qquickweeknumbercolumn_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/calendar/qquickweeknumbercolumn_p.h')
-rw-r--r--src/imports/calendar/qquickweeknumbercolumn_p.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h
index f23d2948..2cacdeac 100644
--- a/src/imports/calendar/qquickweeknumbercolumn_p.h
+++ b/src/imports/calendar/qquickweeknumbercolumn_p.h
@@ -49,7 +49,6 @@
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
-#include <QtCore/qlocale.h>
QT_BEGIN_NAMESPACE
@@ -61,7 +60,6 @@ class QQuickWeekNumberColumn : public QQuickControl
Q_OBJECT
Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL)
Q_PROPERTY(int year READ year WRITE setYear NOTIFY yearChanged FINAL)
- Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL)
Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged FINAL)
Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL)
@@ -74,9 +72,6 @@ public:
int year() const;
void setYear(int year);
- QLocale locale() const;
- void setLocale(const QLocale &locale);
-
QVariant source() const;
void setSource(const QVariant &source);
@@ -86,13 +81,13 @@ public:
Q_SIGNALS:
void monthChanged();
void yearChanged();
- void localeChanged();
void sourceChanged();
void delegateChanged();
protected:
void componentComplete() Q_DECL_OVERRIDE;
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
+ void localeChange(const QLocale &newLocale, const QLocale &oldLocale) Q_DECL_OVERRIDE;
void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) Q_DECL_OVERRIDE;
private:
@@ -100,8 +95,8 @@ private:
Q_DECLARE_PRIVATE(QQuickWeekNumberColumn)
};
-Q_DECLARE_TYPEINFO(QQuickWeekNumberColumn, Q_COMPLEX_TYPE);
-
QT_END_NAMESPACE
+QML_DECLARE_TYPE(QQuickWeekNumberColumn)
+
#endif // QQUICKWEEKNUMBERCOLUMN_P_H