diff options
Diffstat (limited to 'src/imports/calendar/qquickdayofweekrow.cpp')
-rw-r--r-- | src/imports/calendar/qquickdayofweekrow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 76bcf5df..b630adc9 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -37,7 +37,7 @@ #include "qquickdayofweekrow_p.h" #include "qquickdayofweekmodel_p.h" -#include <QtLabsTemplates/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates2/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE @@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE class QQuickDayOfWeekRowPrivate : public QQuickControlPrivate { public: - QQuickDayOfWeekRowPrivate() : delegate(Q_NULLPTR), model(Q_NULLPTR) { } + QQuickDayOfWeekRowPrivate() : delegate(nullptr), model(nullptr) { } void resizeItems(); @@ -90,7 +90,8 @@ void QQuickDayOfWeekRowPrivate::resizeItems() itemSize.setWidth((contentItem->width() - 6 * spacing) / 7); itemSize.setHeight(contentItem->height()); - foreach (QQuickItem *item, contentItem->childItems()) + const auto childItems = contentItem->childItems(); + for (QQuickItem *item : childItems) item->setSize(itemSize); } |