diff options
157 files changed, 949 insertions, 679 deletions
@@ -95,5 +95,6 @@ app_process qtc-debugging-helper android-*.so-deployment-settings.json *.directory +*_plugin_import.cpp *_wrapper.sh *_wrapper.bat diff --git a/.qmake.conf b/.qmake.conf index 79f7457c..12ab0814 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ CONFIG += warning_clean QQC2_SOURCE_TREE = $$PWD -MODULE_VERSION = 5.6.0 +MODULE_VERSION = 5.7.0 diff --git a/src/controls/controls.pri b/src/controls/controls.pri index 005ee839..7aa9447f 100644 --- a/src/controls/controls.pri +++ b/src/controls/controls.pri @@ -1,4 +1,5 @@ HEADERS += \ + $$PWD/qquickcolorimageprovider_p.h \ $$PWD/qquickproxytheme_p.h \ $$PWD/qquickstyle_p.h \ $$PWD/qquickstyleselector_p.h \ @@ -6,6 +7,7 @@ HEADERS += \ $$PWD/qquickpaddedrectangle_p.h SOURCES += \ + $$PWD/qquickcolorimageprovider.cpp \ $$PWD/qquickproxytheme.cpp \ $$PWD/qquickstyle.cpp \ $$PWD/qquickstyleselector.cpp \ diff --git a/src/imports/controls/universal/qquickuniversalimageprovider.cpp b/src/controls/qquickcolorimageprovider.cpp index 7cb7b926..582b73ed 100644 --- a/src/imports/controls/universal/qquickuniversalimageprovider.cpp +++ b/src/controls/qquickcolorimageprovider.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qquickuniversalimageprovider_p.h" +#include "qquickcolorimageprovider_p.h" #include <QtCore/qdebug.h> #include <QtGui/qpainter.h> @@ -44,11 +44,12 @@ QT_BEGIN_NAMESPACE -QQuickUniversalImageProvider::QQuickUniversalImageProvider() : QQuickImageProvider(Image) +QQuickColorImageProvider::QQuickColorImageProvider(const QString &path) + : QQuickImageProvider(Image), m_path(path) { } -QImage QQuickUniversalImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) +QImage QQuickColorImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) { Q_UNUSED(requestedSize); @@ -56,11 +57,11 @@ QImage QQuickUniversalImageProvider::requestImage(const QString &id, QSize *size QString name = id.left(sep); QString color = id.mid(sep + 1); qreal dpr = qApp->primaryScreen()->devicePixelRatio(); - QString file = qt_findAtNxFile(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images/") + name + QStringLiteral(".png"), dpr); + QString file = qt_findAtNxFile(m_path + QLatin1Char('/') + name + QStringLiteral(".png"), dpr); QImage image(file); if (image.isNull()) { - qWarning() << "QQuickUniversalImageProvider: unknown id:" << id; + qWarning() << "QQuickColorImageProvider: unknown id:" << id; return QImage(); } diff --git a/src/imports/controls/universal/qquickuniversalimageprovider_p.h b/src/controls/qquickcolorimageprovider_p.h index 15648157..6f55f75f 100644 --- a/src/imports/controls/universal/qquickuniversalimageprovider_p.h +++ b/src/controls/qquickcolorimageprovider_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QQUICKUNIVERSALIMAGEPROVIDER_P_H -#define QQUICKUNIVERSALIMAGEPROVIDER_P_H +#ifndef QQUICKCOLORIMAGEPROVIDER_P_H +#define QQUICKCOLORIMAGEPROVIDER_P_H // // W A R N I N G @@ -52,14 +52,17 @@ QT_BEGIN_NAMESPACE -class QQuickUniversalImageProvider : public QQuickImageProvider +class QQuickColorImageProvider : public QQuickImageProvider { public: - QQuickUniversalImageProvider(); + QQuickColorImageProvider(const QString &path); - QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE; + QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override; + +private: + QString m_path; }; QT_END_NAMESPACE -#endif // QQUICKUNIVERSALIMAGEPROVIDER_P_H +#endif // QQUICKOCOLORIMAGEPROVIDER_P_H diff --git a/src/controls/qquickpaddedrectangle_p.h b/src/controls/qquickpaddedrectangle_p.h index 5c0a8919..690448d6 100644 --- a/src/controls/qquickpaddedrectangle_p.h +++ b/src/controls/qquickpaddedrectangle_p.h @@ -62,7 +62,7 @@ class QQuickPaddedRectangle : public QQuickRectangle Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL) public: - QQuickPaddedRectangle(QQuickItem *parent = Q_NULLPTR); + QQuickPaddedRectangle(QQuickItem *parent = nullptr); qreal padding() const; void setPadding(qreal padding); @@ -92,7 +92,7 @@ Q_SIGNALS: void bottomPaddingChanged(); protected: - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; private: void setTopPadding(qreal padding, bool has); diff --git a/src/controls/qquickproxytheme_p.h b/src/controls/qquickproxytheme_p.h index 47f931b5..6d7040e5 100644 --- a/src/controls/qquickproxytheme_p.h +++ b/src/controls/qquickproxytheme_p.h @@ -61,33 +61,33 @@ public: QPlatformTheme* theme() const; - QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; - QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE; - QPlatformMenuBar* createPlatformMenuBar() const Q_DECL_OVERRIDE; - void showPlatformMenuBar() Q_DECL_OVERRIDE; + QPlatformMenuItem* createPlatformMenuItem() const override; + QPlatformMenu* createPlatformMenu() const override; + QPlatformMenuBar* createPlatformMenuBar() const override; + void showPlatformMenuBar() override; - bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE; - QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE; + bool usePlatformNativeDialog(DialogType type) const override; + QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override; #ifndef QT_NO_SYSTEMTRAYICON - QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; + QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override; #endif - const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; + const QPalette *palette(Palette type = SystemPalette) const override; - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; + const QFont *font(Font type = SystemFont) const override; - QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; + QVariant themeHint(ThemeHint hint) const override; - QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const Q_DECL_OVERRIDE; + QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override; QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size, - QPlatformTheme::IconOptions iconOptions = 0) const Q_DECL_OVERRIDE; + QPlatformTheme::IconOptions iconOptions = 0) const override; - QIconEngine *createIconEngine(const QString &iconName) const Q_DECL_OVERRIDE; + QIconEngine *createIconEngine(const QString &iconName) const override; - QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const Q_DECL_OVERRIDE; + QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const override; - QString standardButtonText(int button) const Q_DECL_OVERRIDE; + QString standardButtonText(int button) const override; private: QPlatformTheme *m_theme; diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp index 0ca6558e..320148c3 100644 --- a/src/controls/qquickstyle.cpp +++ b/src/controls/qquickstyle.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool create = false) { if (!object) - return Q_NULLPTR; + return nullptr; int idx = -1; return qobject_cast<QQuickStyle *>(qmlAttachedPropertiesObject(&idx, object, type, create)); } @@ -55,7 +55,7 @@ static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *parent) { if (!parent) - return Q_NULLPTR; + return nullptr; QQuickStyle *style = attachedStyle(type, parent); if (style) @@ -97,7 +97,7 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *parent) return style; } - return Q_NULLPTR; + return nullptr; } static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *object) @@ -109,7 +109,8 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob if (QQuickWindow *window = qobject_cast<QQuickWindow *>(object)) { item = window->contentItem(); - foreach (QObject *child, window->children()) { + const auto windowChildren = window->children(); + for (QObject *child : windowChildren) { QQuickWindow *childWindow = qobject_cast<QQuickWindow *>(child); if (childWindow) { QQuickStyle *style = attachedStyle(type, childWindow); @@ -127,7 +128,8 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob } if (item) { - foreach (QQuickItem *child, item->childItems()) { + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { QQuickStyle *style = attachedStyle(type, child); if (style) children += style; @@ -135,7 +137,8 @@ static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *ob children += findChildStyles(type, child); } - foreach (QObject *child, item->children()) { + const auto itemChildren = item->children(); + for (QObject *child : itemChildren) { if (!qobject_cast<QQuickItem *>(child)) { QQuickStyle *style = attachedStyle(type, child); if (style) @@ -162,7 +165,7 @@ QQuickStyle::~QQuickStyle() if (item) QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent); - setParentStyle(Q_NULLPTR); + setParentStyle(nullptr); } QSharedPointer<QSettings> QQuickStyle::settings(const QString &group) @@ -214,8 +217,8 @@ void QQuickStyle::init() if (parentStyle) setParentStyle(parentStyle); - QList<QQuickStyle *> children = findChildStyles(metaObject(), parent); - foreach (QQuickStyle *child, children) + const QList<QQuickStyle *> children = findChildStyles(metaObject(), parent); + for (QQuickStyle *child : children) child->setParentStyle(this); } diff --git a/src/controls/qquickstyle_p.h b/src/controls/qquickstyle_p.h index 02ee667a..36a2320c 100644 --- a/src/controls/qquickstyle_p.h +++ b/src/controls/qquickstyle_p.h @@ -64,7 +64,7 @@ class QQuickStyle : public QObject, public QQuickItemChangeListener Q_OBJECT public: - explicit QQuickStyle(QObject *parent = Q_NULLPTR); + explicit QQuickStyle(QObject *parent = nullptr); ~QQuickStyle(); static QSharedPointer<QSettings> settings(const QString &group = QString()); @@ -79,7 +79,7 @@ protected: virtual void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent); - void itemParentChanged(QQuickItem *item, QQuickItem *parent) Q_DECL_OVERRIDE; + void itemParentChanged(QQuickItem *item, QQuickItem *parent) override; private: QList<QQuickStyle *> m_childStyles; diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index 49b2aa17..b169ade2 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -113,7 +113,7 @@ static QString selectionHelper(const QString &path, const QString &fileName, con */ Q_ASSERT(path.isEmpty() || path.endsWith(QLatin1Char('/'))); - foreach (const QString &s, selectors) { + for (const QString &s : selectors) { QString prospectiveBase = path + s + QLatin1Char('/'); QStringList remainingSelectors = selectors; remainingSelectors.removeAll(s); diff --git a/src/imports/calendar/qquickcalendar_p.h b/src/imports/calendar/qquickcalendar_p.h index c44a6a1c..cdc9cc94 100644 --- a/src/imports/calendar/qquickcalendar_p.h +++ b/src/imports/calendar/qquickcalendar_p.h @@ -59,7 +59,7 @@ class QQuickCalendar : public QObject Q_OBJECT public: - explicit QQuickCalendar(QObject *parent = Q_NULLPTR); + explicit QQuickCalendar(QObject *parent = nullptr); enum Month { January, diff --git a/src/imports/calendar/qquickcalendarmodel_p.h b/src/imports/calendar/qquickcalendarmodel_p.h index 4f17980a..fa7717ed 100644 --- a/src/imports/calendar/qquickcalendarmodel_p.h +++ b/src/imports/calendar/qquickcalendarmodel_p.h @@ -66,7 +66,7 @@ class QQuickCalendarModel : public QAbstractListModel, public QQmlParserStatus Q_PROPERTY(int count READ rowCount NOTIFY countChanged) public: - explicit QQuickCalendarModel(QObject *parent = Q_NULLPTR); + explicit QQuickCalendarModel(QObject *parent = nullptr); QDate from() const; void setFrom(const QDate &from); @@ -84,9 +84,9 @@ public: YearRole }; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; Q_SIGNALS: void fromChanged(); @@ -94,8 +94,8 @@ Q_SIGNALS: void countChanged(); protected: - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; private: Q_DISABLE_COPY(QQuickCalendarModel) diff --git a/src/imports/calendar/qquickdayofweekmodel_p.h b/src/imports/calendar/qquickdayofweekmodel_p.h index 90ebdc6c..9e76b961 100644 --- a/src/imports/calendar/qquickdayofweekmodel_p.h +++ b/src/imports/calendar/qquickdayofweekmodel_p.h @@ -63,7 +63,7 @@ class QQuickDayOfWeekModel : public QAbstractListModel Q_PROPERTY(int count READ rowCount CONSTANT FINAL) public: - explicit QQuickDayOfWeekModel(QObject *parent = Q_NULLPTR); + explicit QQuickDayOfWeekModel(QObject *parent = nullptr); QLocale locale() const; void setLocale(const QLocale &locale); @@ -77,9 +77,9 @@ public: NarrowNameRole }; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; Q_SIGNALS: void localeChanged(); diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 76bcf5df..1f5e4387 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -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); } diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index d1e5e16f..b0c4ead9 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -62,7 +62,7 @@ class QQuickDayOfWeekRow : public QQuickControl Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: - explicit QQuickDayOfWeekRow(QQuickItem *parent = Q_NULLPTR); + explicit QQuickDayOfWeekRow(QQuickItem *parent = nullptr); QVariant source() const; void setSource(const QVariant &source); @@ -75,10 +75,10 @@ Q_SIGNALS: 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; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; private: Q_DISABLE_COPY(QQuickDayOfWeekRow) diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index fd2909f8..8fe9ad63 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -78,7 +78,7 @@ class QQuickMonthGridPrivate : public QQuickControlPrivate Q_DECLARE_PUBLIC(QQuickMonthGrid) public: - QQuickMonthGridPrivate() : pressTimer(0), pressedItem(Q_NULLPTR), model(Q_NULLPTR), delegate(Q_NULLPTR) { } + QQuickMonthGridPrivate() : pressTimer(0), pressedItem(nullptr), model(nullptr), delegate(nullptr) { } void resizeItems(); @@ -108,7 +108,8 @@ void QQuickMonthGridPrivate::resizeItems() itemSize.setWidth((contentItem->width() - 6 * spacing) / 7); itemSize.setHeight((contentItem->height() - 5 * spacing) / 6); - foreach (QQuickItem *item, contentItem->childItems()) + const auto childItems = contentItem->childItems(); + for (QQuickItem *item : childItems) item->setSize(itemSize); } @@ -119,7 +120,7 @@ QQuickItem *QQuickMonthGridPrivate::cellAt(const QPoint &pos) const QPointF mapped = q->mapToItem(contentItem, pos); return contentItem->childAt(mapped.x(), mapped.y()); } - return Q_NULLPTR; + return nullptr; } QDate QQuickMonthGridPrivate::dateOf(QQuickItem *cell) const @@ -150,7 +151,7 @@ void QQuickMonthGridPrivate::clearPress(bool clicked) emit q->clicked(pressedDate); } pressedDate = QDate(); - pressedItem = Q_NULLPTR; + pressedItem = nullptr; } void QQuickMonthGridPrivate::setContextProperty(QQuickItem *item, const QString &name, const QVariant &value) @@ -335,7 +336,8 @@ void QQuickMonthGrid::componentComplete() Q_D(QQuickMonthGrid); QQuickControl::componentComplete(); if (d->contentItem) { - foreach (QQuickItem *child, d->contentItem->childItems()) { + const auto childItems = d->contentItem->childItems(); + for (QQuickItem *child : childItems) { if (!QQuickItemPrivate::get(child)->isTransparentForPositioner()) d->setContextProperty(child, QStringLiteral("pressed"), false); } diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index b2d8124a..93ba3900 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -65,7 +65,7 @@ class QQuickMonthGrid : public QQuickControl Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: - explicit QQuickMonthGrid(QQuickItem *parent = Q_NULLPTR); + explicit QQuickMonthGrid(QQuickItem *parent = nullptr); int month() const; void setMonth(int month); @@ -95,17 +95,17 @@ Q_SIGNALS: void pressAndHold(const QDate &date); 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; - void updatePolish() Q_DECL_OVERRIDE; - - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; + void updatePolish() override; + + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void timerEvent(QTimerEvent *event) override; private: Q_DISABLE_COPY(QQuickMonthGrid) diff --git a/src/imports/calendar/qquickmonthmodel_p.h b/src/imports/calendar/qquickmonthmodel_p.h index 0f8347b5..578fe620 100644 --- a/src/imports/calendar/qquickmonthmodel_p.h +++ b/src/imports/calendar/qquickmonthmodel_p.h @@ -67,7 +67,7 @@ class QQuickMonthModel : public QAbstractListModel Q_PROPERTY(int count READ rowCount CONSTANT FINAL) public: - explicit QQuickMonthModel(QObject *parent = Q_NULLPTR); + explicit QQuickMonthModel(QObject *parent = nullptr); int month() const; void setMonth(int month); @@ -93,9 +93,9 @@ public: YearRole }; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; Q_SIGNALS: void monthChanged(); diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index 3e8f1a6b..031b0555 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE class QQuickWeekNumberColumnPrivate : public QQuickControlPrivate { public: - QQuickWeekNumberColumnPrivate() : delegate(Q_NULLPTR), model(Q_NULLPTR) { } + QQuickWeekNumberColumnPrivate() : delegate(nullptr), model(nullptr) { } void resizeItems(); @@ -92,7 +92,8 @@ void QQuickWeekNumberColumnPrivate::resizeItems() itemSize.setWidth(contentItem->width()); itemSize.setHeight((contentItem->height() - 5 * spacing) / 6); - foreach (QQuickItem *item, contentItem->childItems()) + const auto childItems = contentItem->childItems(); + for (QQuickItem *item : childItems) item->setSize(itemSize); } diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index 2cacdeac..f2e0e1cc 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -64,7 +64,7 @@ class QQuickWeekNumberColumn : public QQuickControl Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: - explicit QQuickWeekNumberColumn(QQuickItem *parent = Q_NULLPTR); + explicit QQuickWeekNumberColumn(QQuickItem *parent = nullptr); int month() const; void setMonth(int month); @@ -85,10 +85,10 @@ Q_SIGNALS: 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; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; private: Q_DISABLE_COPY(QQuickWeekNumberColumn) diff --git a/src/imports/calendar/qquickweeknumbermodel_p.h b/src/imports/calendar/qquickweeknumbermodel_p.h index 2c8b484f..74f2550f 100644 --- a/src/imports/calendar/qquickweeknumbermodel_p.h +++ b/src/imports/calendar/qquickweeknumbermodel_p.h @@ -65,7 +65,7 @@ class QQuickWeekNumberModel : public QAbstractListModel Q_PROPERTY(int count READ rowCount CONSTANT FINAL) public: - explicit QQuickWeekNumberModel(QObject *parent = Q_NULLPTR); + explicit QQuickWeekNumberModel(QObject *parent = nullptr); int month() const; void setMonth(int month); @@ -83,9 +83,9 @@ public: WeekNumberRole = Qt::UserRole + 1 }; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; Q_SIGNALS: void monthChanged(); diff --git a/src/imports/calendar/qtlabscalendarplugin.cpp b/src/imports/calendar/qtlabscalendarplugin.cpp index 8d7d563d..4ecd5ddb 100644 --- a/src/imports/calendar/qtlabscalendarplugin.cpp +++ b/src/imports/calendar/qtlabscalendarplugin.cpp @@ -42,6 +42,13 @@ #include "qquickcalendarmodel_p.h" #include "qquickcalendar_p.h" +static inline void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_calendar); +#endif +} + QT_BEGIN_NAMESPACE class QtLabsCalendarPlugin: public QQmlExtensionPlugin @@ -50,9 +57,15 @@ class QtLabsCalendarPlugin: public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtLabsCalendarPlugin(QObject *parent = nullptr); void registerTypes(const char *uri); }; +QtLabsCalendarPlugin::QtLabsCalendarPlugin(QObject *parent) : QQmlExtensionPlugin(parent) +{ + initResources(); +} + static QObject *calendarSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(engine); diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index adbf8aad..fc32c6f5 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ComboBox { diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 8326fc89..46b6bc6c 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -67,7 +67,7 @@ T.TextArea { color: "#c2c2c2" horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment - visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight } } diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index d9f31b2f..7abf540b 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -66,7 +66,7 @@ T.TextField { color: "#bdbebf" horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment - visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight } diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri index c3391929..32e86f3a 100644 --- a/src/imports/controls/controls.pri +++ b/src/imports/controls/controls.pri @@ -1,4 +1,4 @@ -QML_FILES = \ +QML_CONTROLS = \ ApplicationWindow.qml \ BusyIndicator.qml \ Button.qml \ @@ -33,3 +33,5 @@ QML_FILES = \ ToolBar.qml \ ToolButton.qml \ Tumbler.qml + +!qtquickcompiler: QML_FILES += $$QML_CONTROLS diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 30f8e223..0ccdf5a0 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -27,5 +27,11 @@ RESOURCES += \ include(controls.pri) include(designer/designer.pri) +qtquickcompiler { + qmlfiles.prefix = /qt-project.org/imports/Qt/labs/controls + qmlfiles.files += $$QML_CONTROLS + RESOURCES += qmlfiles +} + CONFIG += no_cxx_module load(qml_plugin) diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 939d5a31..a4af00c7 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.CheckBox { id: control diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index b822bfd2..5979f97a 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 import QtGraphicalEffects 1.0 diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index 8cd53e88..b955c6d9 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.ItemDelegate { id: control diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index f9c69291..15ef6065 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.MenuItem { id: control diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index 96605311..40761be6 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.RadioButton { id: control diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index bf8c16ef..617f9ac7 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.RangeSlider { id: control diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index 139c9151..c121c10b 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.Slider { id: control diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index 7c8e4395..b1a69286 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -36,6 +36,7 @@ import QtQuick 2.6 import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 import Qt.labs.templates 1.0 as T import QtGraphicalEffects 1.0 diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index a5423727..b6f614c0 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -92,7 +92,7 @@ T.TextArea { horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment elide: Text.ElideRight - visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) } //! [placeholder] diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 6a0010f7..eaea710e 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -91,7 +91,7 @@ T.TextField { horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment elide: Text.ElideRight - visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) } //! [placeholder] diff --git a/src/imports/controls/material/qquickmaterialprogressring.cpp b/src/imports/controls/material/qquickmaterialprogressring.cpp index c11a347f..dc96fe03 100644 --- a/src/imports/controls/material/qquickmaterialprogressring.cpp +++ b/src/imports/controls/material/qquickmaterialprogressring.cpp @@ -67,11 +67,11 @@ public: QQuickMaterialRingAnimatorJob(); ~QQuickMaterialRingAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; + void afterNodeSync() override; private: qreal m_devicePixelRatio; @@ -167,8 +167,8 @@ QQuickAnimatorJob *QQuickMaterialRingAnimator::createJob() const QQuickMaterialRingAnimatorJob::QQuickMaterialRingAnimatorJob() : m_devicePixelRatio(1.0), - m_containerNode(Q_NULLPTR), - m_window(Q_NULLPTR) + m_containerNode(nullptr), + m_window(nullptr) { } @@ -258,8 +258,8 @@ void QQuickMaterialRingAnimatorJob::writeBack() void QQuickMaterialRingAnimatorJob::nodeWasDestroyed() { - m_containerNode = Q_NULLPTR; - m_window = Q_NULLPTR; + m_containerNode = nullptr; + m_window = nullptr; } void QQuickMaterialRingAnimatorJob::afterNodeSync() diff --git a/src/imports/controls/material/qquickmaterialprogressring_p.h b/src/imports/controls/material/qquickmaterialprogressring_p.h index 6f4ebc6b..a829f948 100644 --- a/src/imports/controls/material/qquickmaterialprogressring_p.h +++ b/src/imports/controls/material/qquickmaterialprogressring_p.h @@ -60,7 +60,7 @@ class QQuickMaterialProgressRing : public QQuickItem Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL) public: - explicit QQuickMaterialProgressRing(QQuickItem *parent = Q_NULLPTR); + explicit QQuickMaterialProgressRing(QQuickItem *parent = nullptr); ~QQuickMaterialProgressRing(); QColor color() const; @@ -70,7 +70,7 @@ Q_SIGNALS: void colorChanged(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: QColor m_color; @@ -79,11 +79,11 @@ private: class QQuickMaterialRingAnimator : public QQuickAnimator { public: - QQuickMaterialRingAnimator(QObject *parent = Q_NULLPTR); + QQuickMaterialRingAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/material/qquickmaterialprogressstrip.cpp b/src/imports/controls/material/qquickmaterialprogressstrip.cpp index 3ac09e24..a3ff6c9b 100644 --- a/src/imports/controls/material/qquickmaterialprogressstrip.cpp +++ b/src/imports/controls/material/qquickmaterialprogressstrip.cpp @@ -54,11 +54,11 @@ class QQuickMaterialProgressStripAnimatorJob : public QQuickAnimatorJob public: QQuickMaterialProgressStripAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; + void afterNodeSync() override; void moveNode(QSGTransformNode *node, const QRectF &geometry, qreal progress); @@ -66,7 +66,7 @@ private: QSGNode *m_node; }; -QQuickMaterialProgressStripAnimatorJob::QQuickMaterialProgressStripAnimatorJob() : m_node(Q_NULLPTR) +QQuickMaterialProgressStripAnimatorJob::QQuickMaterialProgressStripAnimatorJob() : m_node(nullptr) { } @@ -111,7 +111,7 @@ void QQuickMaterialProgressStripAnimatorJob::writeBack() void QQuickMaterialProgressStripAnimatorJob::nodeWasDestroyed() { - m_node = Q_NULLPTR; + m_node = nullptr; } void QQuickMaterialProgressStripAnimatorJob::afterNodeSync() diff --git a/src/imports/controls/material/qquickmaterialprogressstrip_p.h b/src/imports/controls/material/qquickmaterialprogressstrip_p.h index d0618af6..38333ee5 100644 --- a/src/imports/controls/material/qquickmaterialprogressstrip_p.h +++ b/src/imports/controls/material/qquickmaterialprogressstrip_p.h @@ -61,7 +61,7 @@ class QQuickMaterialProgressStrip : public QQuickItem Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL) public: - QQuickMaterialProgressStrip(QQuickItem *parent = Q_NULLPTR); + QQuickMaterialProgressStrip(QQuickItem *parent = nullptr); QColor color() const; void setColor(const QColor &color); @@ -73,7 +73,7 @@ public: void setIndeterminate(bool indeterminate); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: QColor m_color; @@ -86,11 +86,11 @@ class QQuickMaterialStripAnimator : public QQuickAnimator Q_OBJECT public: - QQuickMaterialStripAnimator(QObject *parent = Q_NULLPTR); + QQuickMaterialStripAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 103db01f..71b48a2b 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -451,7 +451,8 @@ void QQuickMaterialStyle::inheritTheme(Theme theme) void QQuickMaterialStyle::propagateTheme() { - foreach (QQuickStyle *child, childStyles()) { + const auto styles = childStyles(); + for (QQuickStyle *child : styles) { QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child); if (material) material->inheritTheme(m_theme); @@ -590,7 +591,8 @@ void QQuickMaterialStyle::inheritAccent(uint accent, bool custom) void QQuickMaterialStyle::propagateAccent() { - foreach (QQuickStyle *child, childStyles()) { + const auto styles = childStyles(); + for (QQuickStyle *child : styles) { QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child); if (material) material->inheritAccent(m_accent, m_customAccent); diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 67eccb24..00103361 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -145,7 +145,7 @@ public: Q_ENUM(Color) Q_ENUM(Shade) - explicit QQuickMaterialStyle(QObject *parent = Q_NULLPTR); + explicit QQuickMaterialStyle(QObject *parent = nullptr); static QQuickMaterialStyle *qmlAttachedProperties(QObject *object); @@ -212,7 +212,7 @@ Q_SIGNALS: void paletteChanged(); protected: - void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) Q_DECL_OVERRIDE; + void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) override; private: void init(); diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index 28fb30e9..e144233c 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -61,7 +61,7 @@ public: ~QQuickMaterialTheme(); - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; + const QFont *font(Font type = SystemFont) const override; private: QFont systemFont; diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp index ca10c289..0c6f2ad0 100644 --- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp @@ -47,6 +47,9 @@ static inline void initResources() { Q_INIT_RESOURCE(qtlabsmaterialstyleplugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_controls_material); +#endif } QT_BEGIN_NAMESPACE @@ -57,14 +60,20 @@ class QtLabsMaterialStylePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtLabsMaterialStylePlugin(QObject *parent = nullptr); ~QtLabsMaterialStylePlugin(); - void registerTypes(const char *uri) Q_DECL_OVERRIDE; - void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE; + void registerTypes(const char *uri) override; + void initializeEngine(QQmlEngine *engine, const char *uri) override; private: QQuickProxyTheme *theme; }; +QtLabsMaterialStylePlugin::QtLabsMaterialStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent) +{ + initResources(); +} + QtLabsMaterialStylePlugin::~QtLabsMaterialStylePlugin() { if (theme) { @@ -82,7 +91,6 @@ void QtLabsMaterialStylePlugin::registerTypes(const char *uri) void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(engine); - Q_UNUSED(uri); QQuickStyleSelector selector; if (selector.style() == QLatin1String("material")) { @@ -95,13 +103,13 @@ void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char } } - initResources(); - QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickMaterialProgressRing>(import, 1, 0, "ProgressRing"); qmlRegisterType<QQuickMaterialProgressStrip>(import, 1, 0, "ProgressStrip"); qmlRegisterType<QQuickMaterialRingAnimator>(import, 1, 0, "RingAnimator"); qmlRegisterType<QQuickMaterialStripAnimator>(import, 1, 0, "StripAnimator"); + qmlRegisterType(QUrl(baseUrl().toString() + QStringLiteral("/Ripple.qml")), import, 1, 0, "Ripple"); + qmlRegisterType(QUrl(baseUrl().toString() + QStringLiteral("/SliderHandle.qml")), import, 1, 0, "SliderHandle"); } QT_END_NAMESPACE diff --git a/src/imports/controls/qquickbusyindicatorring.cpp b/src/imports/controls/qquickbusyindicatorring.cpp index 96213fa4..06e62c16 100644 --- a/src/imports/controls/qquickbusyindicatorring.cpp +++ b/src/imports/controls/qquickbusyindicatorring.cpp @@ -50,11 +50,11 @@ public: QQuickBusyIndicatorAnimatorJob(); ~QQuickBusyIndicatorAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; + void afterNodeSync() override; private: QSGNode *m_node; @@ -159,7 +159,7 @@ QQuickAnimatorJob *QQuickBusyIndicatorAnimator::createJob() const return new QQuickBusyIndicatorAnimatorJob; } -QQuickBusyIndicatorAnimatorJob::QQuickBusyIndicatorAnimatorJob() : m_node(Q_NULLPTR) +QQuickBusyIndicatorAnimatorJob::QQuickBusyIndicatorAnimatorJob() : m_node(nullptr) { } @@ -217,7 +217,7 @@ void QQuickBusyIndicatorAnimatorJob::writeBack() void QQuickBusyIndicatorAnimatorJob::nodeWasDestroyed() { - m_node = Q_NULLPTR; + m_node = nullptr; } void QQuickBusyIndicatorAnimatorJob::afterNodeSync() diff --git a/src/imports/controls/qquickbusyindicatorring_p.h b/src/imports/controls/qquickbusyindicatorring_p.h index 4697628d..cd1e70ad 100644 --- a/src/imports/controls/qquickbusyindicatorring_p.h +++ b/src/imports/controls/qquickbusyindicatorring_p.h @@ -58,21 +58,21 @@ class QQuickBusyIndicatorRing : public QQuickItem Q_OBJECT public: - explicit QQuickBusyIndicatorRing(QQuickItem *parent = Q_NULLPTR); + explicit QQuickBusyIndicatorRing(QQuickItem *parent = nullptr); ~QQuickBusyIndicatorRing(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; }; class QQuickBusyIndicatorAnimator : public QQuickAnimator { public: - QQuickBusyIndicatorAnimator(QObject *parent = Q_NULLPTR); + QQuickBusyIndicatorAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/qquickprogressstrip.cpp b/src/imports/controls/qquickprogressstrip.cpp index e9480ff1..0fc72087 100644 --- a/src/imports/controls/qquickprogressstrip.cpp +++ b/src/imports/controls/qquickprogressstrip.cpp @@ -47,11 +47,11 @@ public: QQuickProgressAnimatorJob(); ~QQuickProgressAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void afterNodeSync() override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; private: QSGNode *m_node; @@ -210,7 +210,7 @@ QQuickAnimatorJob *QQuickProgressAnimator::createJob() const } QQuickProgressAnimatorJob::QQuickProgressAnimatorJob() : - m_node(Q_NULLPTR) + m_node(nullptr) { } @@ -308,7 +308,7 @@ void QQuickProgressAnimatorJob::writeBack() void QQuickProgressAnimatorJob::nodeWasDestroyed() { - m_node = Q_NULLPTR; + m_node = nullptr; } QT_END_NAMESPACE diff --git a/src/imports/controls/qquickprogressstrip_p.h b/src/imports/controls/qquickprogressstrip_p.h index c34698dc..105c6a29 100644 --- a/src/imports/controls/qquickprogressstrip_p.h +++ b/src/imports/controls/qquickprogressstrip_p.h @@ -60,7 +60,7 @@ class QQuickProgressStrip : public QQuickItem Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged FINAL) public: - explicit QQuickProgressStrip(QQuickItem *parent = Q_NULLPTR); + explicit QQuickProgressStrip(QQuickItem *parent = nullptr); ~QQuickProgressStrip(); bool isIndeterminate() const; @@ -74,7 +74,7 @@ Q_SIGNALS: void indeterminateChanged(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: qreal m_progress; @@ -84,11 +84,11 @@ private: class QQuickProgressAnimator : public QQuickAnimator { public: - QQuickProgressAnimator(QObject *parent = Q_NULLPTR); + QQuickProgressAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp index 4258fb9c..008d13a7 100644 --- a/src/imports/controls/qtlabscontrolsplugin.cpp +++ b/src/imports/controls/qtlabscontrolsplugin.cpp @@ -36,6 +36,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtCore/qurl.h> +#include <QtCore/qfile.h> #include <QtCore/qcoreapplication.h> #include <QtLabsTemplates/private/qquickabstractbutton_p.h> @@ -51,6 +52,9 @@ static inline void initResources() { Q_INIT_RESOURCE(qtlabscontrolsplugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_controls); +#endif } QT_BEGIN_NAMESPACE @@ -61,10 +65,16 @@ class QtLabsControlsPlugin: public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtLabsControlsPlugin(QObject *parent = nullptr); void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); }; +QtLabsControlsPlugin::QtLabsControlsPlugin(QObject *parent) : QQmlExtensionPlugin(parent) +{ + initResources(); +} + void QtLabsControlsPlugin::registerTypes(const char *uri) { qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton"); @@ -74,7 +84,10 @@ void QtLabsControlsPlugin::registerTypes(const char *uri) qmlRegisterType<QQuickControl>(uri, 1, 0, "Control"); QQuickStyleSelector selector; - selector.setBaseUrl(baseUrl()); + if (QFile::exists(QLatin1String(":/qt-project.org/imports/Qt/labs/controls/ApplicationWindow.qml"))) + selector.setBaseUrl(QUrl(QLatin1String("qrc:/qt-project.org/imports/Qt/labs/controls")));\ + else + selector.setBaseUrl(baseUrl()); qmlRegisterType(selector.select(QStringLiteral("/ApplicationWindow.qml")), uri, 1, 0, "ApplicationWindow"); qmlRegisterType(selector.select(QStringLiteral("/BusyIndicator.qml")), uri, 1, 0, "BusyIndicator"); @@ -116,7 +129,6 @@ void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(engine); Q_UNUSED(uri); - initResources(); const QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickBusyIndicatorRing>(import, 1, 0, "BusyRing"); diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 30dac42a..0a5701b9 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T import Qt.labs.controls.universal 1.0 diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 72b69cb9..4f3f8a34 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -73,7 +73,7 @@ T.TextArea { font: control.font color: !control.enabled ? control.Universal.chromeDisabledLowColor : control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor - visible: !control.length && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment renderType: Text.NativeRendering diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 1f066220..a0c854b2 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -74,7 +74,7 @@ T.TextField { font: control.font color: !control.enabled ? control.Universal.chromeDisabledLowColor : control.activeFocus ? control.Universal.chromeBlackMediumLowColor : control.Universal.baseMediumColor - visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment renderType: Text.NativeRendering diff --git a/src/imports/controls/universal/qquickuniversalfocusrectangle_p.h b/src/imports/controls/universal/qquickuniversalfocusrectangle_p.h index 6b15bc8d..628db5b2 100644 --- a/src/imports/controls/universal/qquickuniversalfocusrectangle_p.h +++ b/src/imports/controls/universal/qquickuniversalfocusrectangle_p.h @@ -57,9 +57,9 @@ class QQuickUniversalFocusRectangle : public QQuickPaintedItem Q_OBJECT public: - QQuickUniversalFocusRectangle(QQuickItem *parent = Q_NULLPTR); + QQuickUniversalFocusRectangle(QQuickItem *parent = nullptr); - void paint(QPainter *painter) Q_DECL_OVERRIDE; + void paint(QPainter *painter) override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversalprogressring.cpp b/src/imports/controls/universal/qquickuniversalprogressring.cpp index 2fe66047..9b95341d 100644 --- a/src/imports/controls/universal/qquickuniversalprogressring.cpp +++ b/src/imports/controls/universal/qquickuniversalprogressring.cpp @@ -53,11 +53,11 @@ class QQuickUniversalProgressRingAnimatorJob : public QQuickAnimatorJob public: QQuickUniversalProgressRingAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; + void afterNodeSync() override; private: struct Phase { @@ -73,7 +73,7 @@ private: Phase m_phases[PhaseCount]; }; -QQuickUniversalProgressRingAnimatorJob::QQuickUniversalProgressRingAnimatorJob() : m_node(Q_NULLPTR) +QQuickUniversalProgressRingAnimatorJob::QQuickUniversalProgressRingAnimatorJob() : m_node(nullptr) { m_phases[0] = Phase(433, -110, 10, QEasingCurve::BezierSpline); m_phases[1] = Phase(767, 10, 93, QEasingCurve::Linear ); @@ -153,7 +153,7 @@ void QQuickUniversalProgressRingAnimatorJob::writeBack() void QQuickUniversalProgressRingAnimatorJob::nodeWasDestroyed() { - m_node = Q_NULLPTR; + m_node = nullptr; } void QQuickUniversalProgressRingAnimatorJob::afterNodeSync() diff --git a/src/imports/controls/universal/qquickuniversalprogressring_p.h b/src/imports/controls/universal/qquickuniversalprogressring_p.h index 1d484e3a..f32beb54 100644 --- a/src/imports/controls/universal/qquickuniversalprogressring_p.h +++ b/src/imports/controls/universal/qquickuniversalprogressring_p.h @@ -60,7 +60,7 @@ class QQuickUniversalProgressRing : public QQuickItem Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL) public: - QQuickUniversalProgressRing(QQuickItem *parent = Q_NULLPTR); + QQuickUniversalProgressRing(QQuickItem *parent = nullptr); int count() const; void setCount(int count); @@ -73,7 +73,7 @@ Q_SIGNALS: void colorChanged(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: int m_count; @@ -85,11 +85,11 @@ class QQuickUniversalProgressRingAnimator : public QQuickAnimator Q_OBJECT public: - QQuickUniversalProgressRingAnimator(QObject *parent = Q_NULLPTR); + QQuickUniversalProgressRingAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversalprogressstrip.cpp b/src/imports/controls/universal/qquickuniversalprogressstrip.cpp index 39ce1b5c..c4fab7ae 100644 --- a/src/imports/controls/universal/qquickuniversalprogressstrip.cpp +++ b/src/imports/controls/universal/qquickuniversalprogressstrip.cpp @@ -62,11 +62,11 @@ class QQuickUniversalProgressStripAnimatorJob : public QQuickAnimatorJob public: QQuickUniversalProgressStripAnimatorJob(); - void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE; - void updateCurrentTime(int time) Q_DECL_OVERRIDE; - void writeBack() Q_DECL_OVERRIDE; - void nodeWasDestroyed() Q_DECL_OVERRIDE; - void afterNodeSync() Q_DECL_OVERRIDE; + void initialize(QQuickAnimatorController *controller) override; + void updateCurrentTime(int time) override; + void writeBack() override; + void nodeWasDestroyed() override; + void afterNodeSync() override; private: struct Phase { @@ -82,7 +82,7 @@ private: Phase m_ellipsePhases[PhaseCount]; }; -QQuickUniversalProgressStripAnimatorJob::QQuickUniversalProgressStripAnimatorJob() : m_node(Q_NULLPTR) +QQuickUniversalProgressStripAnimatorJob::QQuickUniversalProgressStripAnimatorJob() : m_node(nullptr) { m_borderPhases[0] = Phase( 500, -50, 0); m_borderPhases[1] = Phase(1500, 0, 0); @@ -203,7 +203,7 @@ void QQuickUniversalProgressStripAnimatorJob::writeBack() void QQuickUniversalProgressStripAnimatorJob::nodeWasDestroyed() { - m_node = Q_NULLPTR; + m_node = nullptr; } void QQuickUniversalProgressStripAnimatorJob::afterNodeSync() diff --git a/src/imports/controls/universal/qquickuniversalprogressstrip_p.h b/src/imports/controls/universal/qquickuniversalprogressstrip_p.h index b61e73c6..1b2c729d 100644 --- a/src/imports/controls/universal/qquickuniversalprogressstrip_p.h +++ b/src/imports/controls/universal/qquickuniversalprogressstrip_p.h @@ -59,7 +59,7 @@ class QQuickUniversalProgressStrip : public QQuickItem Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL) public: - QQuickUniversalProgressStrip(QQuickItem *parent = Q_NULLPTR); + QQuickUniversalProgressStrip(QQuickItem *parent = nullptr); QColor color() const; void setColor(const QColor &color); @@ -68,7 +68,7 @@ Q_SIGNALS: void colorChanged(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: QColor m_color; @@ -79,11 +79,11 @@ class QQuickUniversalProgressStripAnimator : public QQuickAnimator Q_OBJECT public: - QQuickUniversalProgressStripAnimator(QObject *parent = Q_NULLPTR); + QQuickUniversalProgressStripAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp index 2f9c86cb..49b2d9f7 100644 --- a/src/imports/controls/universal/qquickuniversalstyle.cpp +++ b/src/imports/controls/universal/qquickuniversalstyle.cpp @@ -174,7 +174,8 @@ void QQuickUniversalStyle::inheritTheme(Theme theme) void QQuickUniversalStyle::propagateTheme() { - foreach (QQuickStyle *child, childStyles()) { + const auto styles = childStyles(); + for (QQuickStyle *child : styles) { QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child); if (universal) universal->inheritTheme(m_theme); @@ -238,7 +239,8 @@ void QQuickUniversalStyle::inheritAccent(QRgb accent) void QQuickUniversalStyle::propagateAccent() { - foreach (QQuickStyle *child, childStyles()) { + const auto styles = childStyles(); + for (QQuickStyle *child : styles) { QQuickUniversalStyle *universal = qobject_cast<QQuickUniversalStyle *>(child); if (universal) universal->inheritAccent(m_accent); diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h index 00a04c65..bba1876d 100644 --- a/src/imports/controls/universal/qquickuniversalstyle_p.h +++ b/src/imports/controls/universal/qquickuniversalstyle_p.h @@ -87,7 +87,7 @@ class QQuickUniversalStyle : public QQuickStyle Q_PROPERTY(QColor listMediumColor READ listMediumColor NOTIFY paletteChanged FINAL) public: - explicit QQuickUniversalStyle(QObject *parent = Q_NULLPTR); + explicit QQuickUniversalStyle(QObject *parent = nullptr); static QQuickUniversalStyle *qmlAttachedProperties(QObject *object); @@ -190,7 +190,7 @@ Q_SIGNALS: void paletteChanged(); protected: - void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) Q_DECL_OVERRIDE; + void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) override; private: void init(); diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h index 20243917..809d7a89 100644 --- a/src/imports/controls/universal/qquickuniversaltheme_p.h +++ b/src/imports/controls/universal/qquickuniversaltheme_p.h @@ -61,7 +61,7 @@ public: ~QQuickUniversalTheme(); - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; + const QFont *font(Font type = SystemFont) const override; private: QFont systemFont; diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index 6eceb44b..b88e69b5 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -36,18 +36,21 @@ #include <QtQml/qqmlextensionplugin.h> #include "qquickuniversalfocusrectangle_p.h" -#include "qquickuniversalimageprovider_p.h" #include "qquickuniversalprogressring_p.h" #include "qquickuniversalprogressstrip_p.h" #include "qquickuniversalstyle_p.h" #include "qquickuniversaltheme_p.h" #include <QtGui/private/qguiapplication_p.h> +#include <QtLabsControls/private/qquickcolorimageprovider_p.h> #include <QtLabsControls/private/qquickstyleselector_p.h> static inline void initResources() { Q_INIT_RESOURCE(qtlabsuniversalstyleplugin); +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_controls_universal); +#endif } QT_BEGIN_NAMESPACE @@ -58,14 +61,20 @@ class QtLabsUniversalStylePlugin: public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtLabsUniversalStylePlugin(QObject *parent = nullptr); ~QtLabsUniversalStylePlugin(); - void registerTypes(const char *uri) Q_DECL_OVERRIDE; - void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE; + void registerTypes(const char *uri) override; + void initializeEngine(QQmlEngine *engine, const char *uri) override; private: QQuickProxyTheme *theme; }; +QtLabsUniversalStylePlugin::QtLabsUniversalStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent) +{ + initResources(); +} + QtLabsUniversalStylePlugin::~QtLabsUniversalStylePlugin() { if (theme) { @@ -93,8 +102,7 @@ void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char } } - initResources(); - engine->addImageProvider(QStringLiteral("universal"), new QQuickUniversalImageProvider); + engine->addImageProvider(QStringLiteral("universal"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images"))); QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickUniversalFocusRectangle>(import, 1, 0, "FocusRectangle"); diff --git a/src/imports/controls/universal/universal.pri b/src/imports/controls/universal/universal.pri index c7717d78..965228cb 100644 --- a/src/imports/controls/universal/universal.pri +++ b/src/imports/controls/universal/universal.pri @@ -34,7 +34,6 @@ QML_FILES += \ HEADERS += \ $$PWD/qquickuniversalfocusrectangle_p.h \ - $$PWD/qquickuniversalimageprovider_p.h \ $$PWD/qquickuniversalprogressring_p.h \ $$PWD/qquickuniversalprogressstrip_p.h \ $$PWD/qquickuniversalstyle_p.h \ @@ -42,7 +41,6 @@ HEADERS += \ SOURCES += \ $$PWD/qquickuniversalfocusrectangle.cpp \ - $$PWD/qquickuniversalimageprovider.cpp \ $$PWD/qquickuniversalprogressring.cpp \ $$PWD/qquickuniversalprogressstrip.cpp \ $$PWD/qquickuniversalstyle.cpp \ diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtlabstemplatesplugin.cpp index 635a2006..be7882c4 100644 --- a/src/imports/templates/qtlabstemplatesplugin.cpp +++ b/src/imports/templates/qtlabstemplatesplugin.cpp @@ -75,6 +75,13 @@ #include <QtLabsTemplates/private/qquicktoolbutton_p.h> #include <QtLabsTemplates/private/qquicktumbler_p.h> +static inline void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_Qt_labs_templates); +#endif +} + QT_BEGIN_NAMESPACE class QtLabsTemplatesPlugin: public QQmlExtensionPlugin @@ -83,9 +90,15 @@ class QtLabsTemplatesPlugin: public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QtLabsTemplatesPlugin(QObject *parent = nullptr); void registerTypes(const char *uri); }; +QtLabsTemplatesPlugin::QtLabsTemplatesPlugin(QObject *parent) : QQmlExtensionPlugin(parent) +{ + initResources(); +} + void QtLabsTemplatesPlugin::registerTypes(const char *uri) { qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton"); diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 664efce5..ca727404 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -100,7 +100,7 @@ static const int AUTO_REPEAT_INTERVAL = 100; QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() : pressed(false), checked(false), checkable(false), highlighted(false), autoExclusive(false), autoRepeat(false), - delayTimer(0), repeatTimer(0), repeatButton(Qt::NoButton), label(Q_NULLPTR), indicator(Q_NULLPTR), group(Q_NULLPTR) + delayTimer(0), repeatTimer(0), repeatButton(Qt::NoButton), label(nullptr), indicator(nullptr), group(nullptr) { } @@ -137,7 +137,7 @@ QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const if (group) return qobject_cast<QQuickAbstractButton *>(group->checkedButton()); - QList<QQuickAbstractButton *> buttons = findExclusiveButtons(); + const QList<QQuickAbstractButton *> buttons = findExclusiveButtons(); // TODO: A singular QRadioButton can be unchecked, which seems logical, // because there's nothing to be exclusive with. However, a RadioButton // from QtQuick.Controls 1.x can never be unchecked, which is the behavior @@ -145,13 +145,13 @@ QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const // gives the QRadioButton behavior. Notice that tst_radiobutton.qml needs // to be updated. if (!autoExclusive /*|| buttons.count() == 1*/) - return Q_NULLPTR; + return nullptr; - foreach (QQuickAbstractButton *button, buttons) { + for (QQuickAbstractButton *button : buttons) { if (button->isChecked() && button != q) return button; } - return checked ? const_cast<QQuickAbstractButton *>(q) : Q_NULLPTR; + return checked ? const_cast<QQuickAbstractButton *>(q) : nullptr; } QList<QQuickAbstractButton *> QQuickAbstractButtonPrivate::findExclusiveButtons() const @@ -166,7 +166,8 @@ QList<QQuickAbstractButton *> QQuickAbstractButtonPrivate::findExclusiveButtons( buttons += button; } } else if (parentItem) { - foreach (QQuickItem *child, parentItem->childItems()) { + const auto childItems = parentItem->childItems(); + for (QQuickItem *child : childItems) { QQuickAbstractButton *button = qobject_cast<QQuickAbstractButton *>(child); if (button && button->autoExclusive() && !QQuickAbstractButtonPrivate::get(button)->group) buttons += button; diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index 0dd94ff5..b50f5ec7 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl Q_PROPERTY(QQuickItem *label READ label WRITE setLabel NOTIFY labelChanged FINAL) public: - explicit QQuickAbstractButton(QQuickItem *parent = Q_NULLPTR); + explicit QQuickAbstractButton(QQuickItem *parent = nullptr); ~QQuickAbstractButton(); QString text() const; @@ -120,22 +120,22 @@ Q_SIGNALS: protected: QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent); - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void timerEvent(QTimerEvent *event) override; virtual void checkStateSet(); virtual void nextCheckState(); #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index 0903dcd5..96087fc9 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -39,6 +39,8 @@ #include "qquickcontrol_p_p.h" #include "qquicktextarea_p.h" #include "qquicktextfield_p.h" +#include "qquicktoolbar_p.h" +#include "qquicktabbar_p.h" #include <QtCore/private/qobject_p.h> #include <QtQuick/private/qquickitem_p.h> @@ -93,17 +95,17 @@ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener public: QQuickApplicationWindowPrivate() : complete(false) - , contentItem(Q_NULLPTR) - , header(Q_NULLPTR) - , footer(Q_NULLPTR) - , overlay(Q_NULLPTR) - , activeFocusControl(Q_NULLPTR) + , contentItem(nullptr) + , header(nullptr) + , footer(nullptr) + , overlay(nullptr) + , activeFocusControl(nullptr) { } void relayout(); - void itemImplicitWidthChanged(QQuickItem *item) Q_DECL_OVERRIDE; - void itemImplicitHeightChanged(QQuickItem *item) Q_DECL_OVERRIDE; + void itemImplicitWidthChanged(QQuickItem *item) override; + void itemImplicitHeightChanged(QQuickItem *item) override; void updateFont(const QFont &); inline void setFont_helper(const QFont &f) { @@ -230,6 +232,9 @@ QQuickApplicationWindow::~QQuickApplicationWindow() This property holds the window header item. The header item is positioned to the top, and resized to the width of the window. The default value is \c null. + \note Assigning a ToolBar or TabBar as a window header sets the respective + \l ToolBar::position or \l TabBar::position property automatically to \c Header. + \sa footer, Page::header */ QQuickItem *QQuickApplicationWindow::header() const @@ -251,6 +256,10 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) p->addItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (qFuzzyIsNull(header->z())) header->setZ(1); + if (QQuickToolBar *toolBar = qobject_cast<QQuickToolBar *>(header)) + toolBar->setPosition(QQuickToolBar::Header); + else if (QQuickTabBar *tabBar = qobject_cast<QQuickTabBar *>(header)) + tabBar->setPosition(QQuickTabBar::Header); if (isComponentComplete()) d->relayout(); } @@ -264,6 +273,9 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) This property holds the window footer item. The footer item is positioned to the bottom, and resized to the width of the window. The default value is \c null. + \note Assigning a ToolBar or TabBar as a window footer sets the respective + \l ToolBar::position or \l TabBar::position property automatically to \c Footer. + \sa header, Page::footer */ QQuickItem *QQuickApplicationWindow::footer() const @@ -285,6 +297,10 @@ void QQuickApplicationWindow::setFooter(QQuickItem *footer) p->addItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (qFuzzyIsNull(footer->z())) footer->setZ(1); + if (QQuickToolBar *toolBar = qobject_cast<QQuickToolBar *>(footer)) + toolBar->setPosition(QQuickToolBar::Footer); + else if (QQuickTabBar *tabBar = qobject_cast<QQuickTabBar *>(footer)) + tabBar->setPosition(QQuickTabBar::Footer); if (isComponentComplete()) d->relayout(); } @@ -474,7 +490,7 @@ class QQuickApplicationWindowAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickApplicationWindowAttached) public: - QQuickApplicationWindowAttachedPrivate() : window(Q_NULLPTR) { } + QQuickApplicationWindowAttachedPrivate() : window(nullptr) { } void windowChange(QQuickWindow *wnd); @@ -550,7 +566,7 @@ QQuickApplicationWindow *QQuickApplicationWindowAttached::window() const QQuickItem *QQuickApplicationWindowAttached::contentItem() const { Q_D(const QQuickApplicationWindowAttached); - return d->window ? d->window->contentItem() : Q_NULLPTR; + return d->window ? d->window->contentItem() : nullptr; } /*! @@ -566,7 +582,7 @@ QQuickItem *QQuickApplicationWindowAttached::contentItem() const QQuickItem *QQuickApplicationWindowAttached::activeFocusControl() const { Q_D(const QQuickApplicationWindowAttached); - return d->window ? d->window->activeFocusControl() : Q_NULLPTR; + return d->window ? d->window->activeFocusControl() : nullptr; } /*! @@ -579,7 +595,7 @@ QQuickItem *QQuickApplicationWindowAttached::activeFocusControl() const QQuickItem *QQuickApplicationWindowAttached::header() const { Q_D(const QQuickApplicationWindowAttached); - return d->window ? d->window->header() : Q_NULLPTR; + return d->window ? d->window->header() : nullptr; } /*! @@ -592,7 +608,7 @@ QQuickItem *QQuickApplicationWindowAttached::header() const QQuickItem *QQuickApplicationWindowAttached::footer() const { Q_D(const QQuickApplicationWindowAttached); - return d->window ? d->window->footer() : Q_NULLPTR; + return d->window ? d->window->footer() : nullptr; } /*! @@ -604,7 +620,7 @@ QQuickItem *QQuickApplicationWindowAttached::footer() const QQuickOverlay *QQuickApplicationWindowAttached::overlay() const { Q_D(const QQuickApplicationWindowAttached); - return d->window ? d->window->overlay() : Q_NULLPTR; + return d->window ? d->window->overlay() : nullptr; } QT_END_NAMESPACE diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index f62ddee3..960e5714 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -74,7 +74,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImp Q_CLASSINFO("DefaultProperty", "data") public: - explicit QQuickApplicationWindow(QWindow *parent = Q_NULLPTR); + explicit QQuickApplicationWindow(QWindow *parent = nullptr); ~QQuickApplicationWindow(); QQuickItem *contentItem() const; @@ -109,9 +109,9 @@ Q_SIGNALS: protected: bool isComponentComplete() const; - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; + void resizeEvent(QResizeEvent *event) override; private: Q_DISABLE_COPY(QQuickApplicationWindow) @@ -131,7 +131,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindowAttached : public QObject Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) public: - explicit QQuickApplicationWindowAttached(QObject *parent = Q_NULLPTR); + explicit QQuickApplicationWindowAttached(QObject *parent = nullptr); QQuickApplicationWindow *window() const; QQuickItem *contentItem() const; diff --git a/src/templates/qquickbusyindicator_p.h b/src/templates/qquickbusyindicator_p.h index 8be19d5c..e5e72044 100644 --- a/src/templates/qquickbusyindicator_p.h +++ b/src/templates/qquickbusyindicator_p.h @@ -60,7 +60,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL) public: - explicit QQuickBusyIndicator(QQuickItem *parent = Q_NULLPTR); + explicit QQuickBusyIndicator(QQuickItem *parent = nullptr); bool isRunning() const; void setRunning(bool running); @@ -70,7 +70,7 @@ Q_SIGNALS: protected: #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickbutton_p.h b/src/templates/qquickbutton_p.h index 83d22fb8..12c3667c 100644 --- a/src/templates/qquickbutton_p.h +++ b/src/templates/qquickbutton_p.h @@ -57,10 +57,10 @@ class Q_LABSTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton Q_OBJECT public: - explicit QQuickButton(QQuickItem *parent = Q_NULLPTR); + explicit QQuickButton(QQuickItem *parent = nullptr); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; }; QT_END_NAMESPACE diff --git a/src/templates/qquickbuttongroup.cpp b/src/templates/qquickbuttongroup.cpp index 0865277e..c1822183 100644 --- a/src/templates/qquickbuttongroup.cpp +++ b/src/templates/qquickbuttongroup.cpp @@ -129,7 +129,7 @@ class QQuickButtonGroupPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickButtonGroup) public: - QQuickButtonGroupPrivate() : checkedButton(Q_NULLPTR) { } + QQuickButtonGroupPrivate() : checkedButton(nullptr) { } void clear(); void updateCurrent(); @@ -145,8 +145,8 @@ public: void QQuickButtonGroupPrivate::clear() { - foreach (QQuickAbstractButton *button, buttons) { - QQuickAbstractButtonPrivate::get(button)->group = Q_NULLPTR; + for (QQuickAbstractButton *button : qAsConst(buttons)) { + QQuickAbstractButtonPrivate::get(button)->group = nullptr; QObjectPrivate::disconnect(button, &QQuickAbstractButton::checkedChanged, this, &QQuickButtonGroupPrivate::updateCurrent); } buttons.clear(); @@ -184,7 +184,7 @@ void QQuickButtonGroupPrivate::buttons_clear(QQmlListProperty<QQuickAbstractButt if (!p->buttons.isEmpty()) { p->clear(); QQuickButtonGroup *q = static_cast<QQuickButtonGroup *>(prop->object); - q->setCheckedButton(Q_NULLPTR); + q->setCheckedButton(nullptr); emit q->buttonsChanged(); } } @@ -312,11 +312,11 @@ void QQuickButtonGroup::removeButton(QQuickAbstractButton *button) if (!button || !d->buttons.contains(button)) return; - QQuickAbstractButtonPrivate::get(button)->group = Q_NULLPTR; + QQuickAbstractButtonPrivate::get(button)->group = nullptr; QObjectPrivate::disconnect(button, &QQuickAbstractButton::checkedChanged, d, &QQuickButtonGroupPrivate::updateCurrent); if (d->checkedButton == button) - setCheckedButton(Q_NULLPTR); + setCheckedButton(nullptr); d->buttons.removeOne(button); emit buttonsChanged(); @@ -325,7 +325,7 @@ void QQuickButtonGroup::removeButton(QQuickAbstractButton *button) class QQuickButtonGroupAttachedPrivate : public QObjectPrivate { public: - QQuickButtonGroupAttachedPrivate() : group(Q_NULLPTR) { } + QQuickButtonGroupAttachedPrivate() : group(nullptr) { } QQuickButtonGroup *group; }; diff --git a/src/templates/qquickbuttongroup_p.h b/src/templates/qquickbuttongroup_p.h index 6210079d..5863e70b 100644 --- a/src/templates/qquickbuttongroup_p.h +++ b/src/templates/qquickbuttongroup_p.h @@ -66,7 +66,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickButtonGroup : public QObject Q_PROPERTY(QQmlListProperty<QQuickAbstractButton> buttons READ buttons NOTIFY buttonsChanged FINAL) public: - explicit QQuickButtonGroup(QObject *parent = Q_NULLPTR); + explicit QQuickButtonGroup(QObject *parent = nullptr); ~QQuickButtonGroup(); static QQuickButtonGroupAttached *qmlAttachedProperties(QObject *object); @@ -95,7 +95,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickButtonGroupAttached : public QObject Q_PROPERTY(QQuickButtonGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL) public: - explicit QQuickButtonGroupAttached(QObject *parent = Q_NULLPTR); + explicit QQuickButtonGroupAttached(QObject *parent = nullptr); QQuickButtonGroup *group() const; void setGroup(QQuickButtonGroup *group); diff --git a/src/templates/qquickcheckbox_p.h b/src/templates/qquickcheckbox_p.h index 4c0d505f..e3dcf76e 100644 --- a/src/templates/qquickcheckbox_p.h +++ b/src/templates/qquickcheckbox_p.h @@ -61,7 +61,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickCheckBox : public QQuickAbstractButton Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL) public: - explicit QQuickCheckBox(QQuickItem *parent = Q_NULLPTR); + explicit QQuickCheckBox(QQuickItem *parent = nullptr); bool isTristate() const; void setTristate(bool tristate); @@ -74,13 +74,13 @@ Q_SIGNALS: void checkStateChanged(); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; - void checkStateSet() Q_DECL_OVERRIDE; - void nextCheckState() Q_DECL_OVERRIDE; + void checkStateSet() override; + void nextCheckState() override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp index f4cb17af..a8c66ce6 100644 --- a/src/templates/qquickcombobox.cpp +++ b/src/templates/qquickcombobox.cpp @@ -123,7 +123,7 @@ class QQuickComboBoxDelegateModel : public QQmlDelegateModel { public: explicit QQuickComboBoxDelegateModel(QQuickComboBox *combo); - QString stringValue(int index, const QString &role) Q_DECL_OVERRIDE; + QString stringValue(int index, const QString &role) override; private: QQuickComboBox *combo; @@ -155,8 +155,8 @@ class QQuickComboBoxPrivate : public QQuickControlPrivate public: QQuickComboBoxPrivate() : pressed(false), ownModel(false), hasDisplayText(false), - highlightedIndex(-1), currentIndex(-1), delegateModel(Q_NULLPTR), - delegate(Q_NULLPTR), popup(Q_NULLPTR) { } + highlightedIndex(-1), currentIndex(-1), delegateModel(nullptr), + delegate(nullptr), popup(nullptr) { } bool isPopupVisible() const; void showPopup(); @@ -227,7 +227,7 @@ void QQuickComboBoxPrivate::togglePopup(bool accept) void QQuickComboBoxPrivate::itemClicked() { Q_Q(QQuickComboBox); - int index = delegateModel->indexOf(q->sender(), Q_NULLPTR); + int index = delegateModel->indexOf(q->sender(), nullptr); if (index != -1) { setHighlightedIndex(index); emit q->highlighted(index); @@ -357,7 +357,7 @@ QQuickComboBox::~QQuickComboBox() { Q_D(QQuickComboBox); delete d->popup; - d->popup = Q_NULLPTR; + d->popup = nullptr; } /*! diff --git a/src/templates/qquickcombobox_p.h b/src/templates/qquickcombobox_p.h index 1d8f498a..431dccb0 100644 --- a/src/templates/qquickcombobox_p.h +++ b/src/templates/qquickcombobox_p.h @@ -72,7 +72,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickComboBox : public QQuickControl Q_PROPERTY(QQuickPopup *popup READ popup WRITE setPopup NOTIFY popupChanged FINAL) public: - explicit QQuickComboBox(QQuickItem *parent = Q_NULLPTR); + explicit QQuickComboBox(QQuickItem *parent = nullptr); ~QQuickComboBox(); int count() const; @@ -124,17 +124,17 @@ Q_SIGNALS: void highlighted(int index); protected: - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; - void componentComplete() Q_DECL_OVERRIDE; + void componentComplete() override; - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; private: Q_DISABLE_COPY(QQuickComboBox) diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp index 841eae8a..d5c387fb 100644 --- a/src/templates/qquickcontainer.cpp +++ b/src/templates/qquickcontainer.cpp @@ -64,7 +64,7 @@ static QQuickItem *effectiveContentItem(QQuickItem *item) return item; } -QQuickContainerPrivate::QQuickContainerPrivate() : contentModel(Q_NULLPTR), currentIndex(-1), updatingCurrent(false) +QQuickContainerPrivate::QQuickContainerPrivate() : contentModel(nullptr), currentIndex(-1), updatingCurrent(false) { } @@ -155,7 +155,7 @@ void QQuickContainerPrivate::removeItem(int index, QQuickItem *item) } QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent); - item->setParentItem(Q_NULLPTR); + item->setParentItem(nullptr); contentModel->remove(index); q->itemRemoved(index, item); @@ -184,7 +184,7 @@ void QQuickContainerPrivate::itemParentChanged(QQuickItem *item, QQuickItem *par { // remove dynamically unparented items (eg. by a Repeater) if (!parent) - removeItem(contentModel->indexOf(item, Q_NULLPTR), item); + removeItem(contentModel->indexOf(item, nullptr), item); } void QQuickContainerPrivate::itemSiblingOrderChanged(QQuickItem *) @@ -194,14 +194,14 @@ void QQuickContainerPrivate::itemSiblingOrderChanged(QQuickItem *) QList<QQuickItem *> siblings = effectiveContentItem(contentItem)->childItems(); for (int i = 0; i < siblings.count(); ++i) { QQuickItem* sibling = siblings.at(i); - int index = contentModel->indexOf(sibling, Q_NULLPTR); + int index = contentModel->indexOf(sibling, nullptr); q->moveItem(index, i); } } void QQuickContainerPrivate::itemDestroyed(QQuickItem *item) { - int index = contentModel->indexOf(item, Q_NULLPTR); + int index = contentModel->indexOf(item, nullptr); if (index != -1) removeItem(index, item); } @@ -215,7 +215,7 @@ void QQuickContainerPrivate::contentData_append(QQmlListProperty<QObject> *prop, if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) { QQuickItemPrivate::get(item)->addItemChangeListener(p, QQuickItemPrivate::SiblingOrder); item->setParentItem(effectiveContentItem(p->contentItem)); - } else if (p->contentModel->indexOf(item, Q_NULLPTR) == -1) { + } else if (p->contentModel->indexOf(item, nullptr) == -1) { q->addItem(item); } } else { @@ -333,7 +333,7 @@ void QQuickContainer::insertItem(int index, QQuickItem *item) if (index < 0 || index > count) index = count; - int oldIndex = d->contentModel->indexOf(item, Q_NULLPTR); + int oldIndex = d->contentModel->indexOf(item, nullptr); if (oldIndex != -1) { if (oldIndex < index) --index; @@ -465,7 +465,7 @@ void QQuickContainer::itemChange(ItemChange change, const ItemChangeData &data) Q_D(QQuickContainer); QQuickControl::itemChange(change, data); if (change == QQuickItem::ItemChildAddedChange && isComponentComplete() && data.item != d->background && data.item != d->contentItem) { - if (!QQuickItemPrivate::get(data.item)->isTransparentForPositioner() && d->contentModel->indexOf(data.item, Q_NULLPTR) == -1) + if (!QQuickItemPrivate::get(data.item)->isTransparentForPositioner() && d->contentModel->indexOf(data.item, nullptr) == -1) addItem(data.item); } } diff --git a/src/templates/qquickcontainer_p.h b/src/templates/qquickcontainer_p.h index 83476f66..e11d5716 100644 --- a/src/templates/qquickcontainer_p.h +++ b/src/templates/qquickcontainer_p.h @@ -67,7 +67,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickContainer : public QQuickControl Q_CLASSINFO("DefaultProperty", "contentData") public: - explicit QQuickContainer(QQuickItem *parent = Q_NULLPTR); + explicit QQuickContainer(QQuickItem *parent = nullptr); ~QQuickContainer(); int count() const; @@ -96,8 +96,8 @@ Q_SIGNALS: protected: QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent); - void itemChange(ItemChange change, const ItemChangeData &data) Q_DECL_OVERRIDE; - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &data) override; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; virtual bool isContent(QQuickItem *item) const; virtual void itemAdded(int index, QQuickItem *item); diff --git a/src/templates/qquickcontainer_p_p.h b/src/templates/qquickcontainer_p_p.h index 6eb79c88..8c1d470c 100644 --- a/src/templates/qquickcontainer_p_p.h +++ b/src/templates/qquickcontainer_p_p.h @@ -71,10 +71,10 @@ public: void _q_currentIndexChanged(); - void itemChildAdded(QQuickItem *item, QQuickItem *child) Q_DECL_OVERRIDE; - void itemSiblingOrderChanged(QQuickItem *item) Q_DECL_OVERRIDE; - void itemParentChanged(QQuickItem *item, QQuickItem *parent) Q_DECL_OVERRIDE; - void itemDestroyed(QQuickItem *item) Q_DECL_OVERRIDE; + void itemChildAdded(QQuickItem *item, QQuickItem *child) override; + void itemSiblingOrderChanged(QQuickItem *item) override; + void itemParentChanged(QQuickItem *item, QQuickItem *parent) override; + void itemDestroyed(QQuickItem *item) override; static void contentData_append(QQmlListProperty<QObject> *prop, QObject *obj); static int contentData_count(QQmlListProperty<QObject> *prop); diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index 6bedfe3f..42ab4c70 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE QQuickControlPrivate::QQuickControlPrivate() : hasTopPadding(false), hasLeftPadding(false), hasRightPadding(false), hasBottomPadding(false), hasLocale(false), padding(0), topPadding(0), leftPadding(0), rightPadding(0), bottomPadding(0), spacing(0), focusReason(Qt::OtherFocusReason), - background(Q_NULLPTR), contentItem(Q_NULLPTR), accessibleAttached(Q_NULLPTR) + background(nullptr), contentItem(nullptr), accessibleAttached(nullptr) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); @@ -284,7 +284,8 @@ void QQuickControlPrivate::updateFont(const QFont &f) void QQuickControlPrivate::updateFontRecur(QQuickItem *item, const QFont &f) { - foreach (QQuickItem *child, item->childItems()) { + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { if (QQuickControl *control = qobject_cast<QQuickControl *>(child)) QQuickControlPrivate::get(control)->resolveFont(); else if (QQuickLabel *label = qobject_cast<QQuickLabel *>(child)) @@ -688,7 +689,8 @@ void QQuickControlPrivate::updateLocale(const QLocale &l, bool e) void QQuickControlPrivate::updateLocaleRecur(QQuickItem *item, const QLocale &l) { - foreach (QQuickItem *child, item->childItems()) { + const auto childItems = item->childItems(); + for (QQuickItem *child : childItems) { if (QQuickControl *control = qobject_cast<QQuickControl *>(child)) QQuickControlPrivate::get(control)->updateLocale(l, false); else diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 8d4055e5..648a140b 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -75,7 +75,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) public: - explicit QQuickControl(QQuickItem *parent = Q_NULLPTR); + explicit QQuickControl(QQuickItem *parent = nullptr); QFont font() const; void setFont(const QFont &); @@ -144,18 +144,18 @@ protected: QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent); - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &value) override; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; virtual void mirrorChange(); virtual void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding); diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index 21f6c1b1..1450184b 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -77,7 +77,7 @@ public: return control->d_func(); } - void mirrorChange() Q_DECL_OVERRIDE; + void mirrorChange() override; void setTopPadding(qreal value, bool reset = false); void setLeftPadding(qreal value, bool reset = false); @@ -88,8 +88,8 @@ public: void resizeContent(); #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif void updateFont(const QFont &); diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp index 830decb0..2ad86f45 100644 --- a/src/templates/qquickdial.cpp +++ b/src/templates/qquickdial.cpp @@ -92,7 +92,7 @@ public: stepSize(0), pressed(false), snapMode(QQuickDial::NoSnap), - handle(Q_NULLPTR) + handle(nullptr) { } diff --git a/src/templates/qquickdial_p.h b/src/templates/qquickdial_p.h index 19d37547..2fd2f649 100644 --- a/src/templates/qquickdial_p.h +++ b/src/templates/qquickdial_p.h @@ -71,7 +71,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickDial : public QQuickControl Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) public: - explicit QQuickDial(QQuickItem *parent = Q_NULLPTR); + explicit QQuickDial(QQuickItem *parent = nullptr); qreal from() const; void setFrom(qreal from); @@ -121,18 +121,18 @@ Q_SIGNALS: void handleChanged(); protected: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void mirrorChange() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void mirrorChange() override; + void componentComplete() override; #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickdrawer.cpp b/src/templates/qquickdrawer.cpp index 5f3d95c9..2eb12676 100644 --- a/src/templates/qquickdrawer.cpp +++ b/src/templates/qquickdrawer.cpp @@ -97,14 +97,14 @@ class QQuickDrawerPrivate : public QQuickControlPrivate, public QQuickItemChange public: QQuickDrawerPrivate() : edge(Qt::LeftEdge), offset(0), position(0), - content(Q_NULLPTR), animation(Q_NULLPTR) { } + content(nullptr), animation(nullptr) { } void updateContent(); bool handleMousePressEvent(QQuickItem *item, QMouseEvent *event); bool handleMouseMoveEvent(QQuickItem *item, QMouseEvent *event); bool handleMouseReleaseEvent(QQuickItem *item, QMouseEvent *event); - void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) override; Qt::Edge edge; qreal offset; diff --git a/src/templates/qquickdrawer_p.h b/src/templates/qquickdrawer_p.h index f953b0fd..39f1802a 100644 --- a/src/templates/qquickdrawer_p.h +++ b/src/templates/qquickdrawer_p.h @@ -66,7 +66,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickDrawer : public QQuickControl Q_CLASSINFO("DefaultProperty", "contentItem") public: - explicit QQuickDrawer(QQuickItem *parent = Q_NULLPTR); + explicit QQuickDrawer(QQuickItem *parent = nullptr); Qt::Edge edge() const; void setEdge(Qt::Edge edge); @@ -92,13 +92,13 @@ Q_SIGNALS: void animationChanged(); protected: - bool childMouseEventFilter(QQuickItem *child, QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + bool childMouseEventFilter(QQuickItem *child, QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void componentComplete() override; virtual qreal positionAt(const QPointF &point) const; diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp index 67dfe256..6ca9da0e 100644 --- a/src/templates/qquickframe.cpp +++ b/src/templates/qquickframe.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE \sa {Customizing Frame}, {Container Controls} */ -QQuickFramePrivate::QQuickFramePrivate() : frame(Q_NULLPTR) +QQuickFramePrivate::QQuickFramePrivate() : frame(nullptr) { } diff --git a/src/templates/qquickframe_p.h b/src/templates/qquickframe_p.h index 0bfd63e8..8f5ac775 100644 --- a/src/templates/qquickframe_p.h +++ b/src/templates/qquickframe_p.h @@ -60,7 +60,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickFrame : public QQuickPane Q_PROPERTY(QQuickItem *frame READ frame WRITE setFrame NOTIFY frameChanged FINAL) public: - explicit QQuickFrame(QQuickItem *parent = Q_NULLPTR); + explicit QQuickFrame(QQuickItem *parent = nullptr); QQuickItem *frame() const; void setFrame(QQuickItem *frame); diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp index 84944987..011245b1 100644 --- a/src/templates/qquickgroupbox.cpp +++ b/src/templates/qquickgroupbox.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE class QQuickGroupBoxPrivate : public QQuickFramePrivate { public: - QQuickGroupBoxPrivate() : label(Q_NULLPTR) { } + QQuickGroupBoxPrivate() : label(nullptr) { } QString title; QQuickItem *label; diff --git a/src/templates/qquickgroupbox_p.h b/src/templates/qquickgroupbox_p.h index b81d6534..81ba58ab 100644 --- a/src/templates/qquickgroupbox_p.h +++ b/src/templates/qquickgroupbox_p.h @@ -61,7 +61,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame Q_PROPERTY(QQuickItem *label READ label WRITE setLabel NOTIFY labelChanged FINAL) public: - explicit QQuickGroupBox(QQuickItem *parent = Q_NULLPTR); + explicit QQuickGroupBox(QQuickItem *parent = nullptr); QString title() const; void setTitle(const QString &title); @@ -74,7 +74,7 @@ Q_SIGNALS: void labelChanged(); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; private: Q_DISABLE_COPY(QQuickGroupBox) diff --git a/src/templates/qquickitemdelegate_p.h b/src/templates/qquickitemdelegate_p.h index 1be909d7..24d90c20 100644 --- a/src/templates/qquickitemdelegate_p.h +++ b/src/templates/qquickitemdelegate_p.h @@ -59,13 +59,13 @@ class Q_LABSTEMPLATES_EXPORT QQuickItemDelegate : public QQuickAbstractButton Q_OBJECT public: - explicit QQuickItemDelegate(QQuickItem *parent = Q_NULLPTR); + explicit QQuickItemDelegate(QQuickItem *parent = nullptr); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquicklabel.cpp b/src/templates/qquicklabel.cpp index 13ff3a6e..8420deb1 100644 --- a/src/templates/qquicklabel.cpp +++ b/src/templates/qquicklabel.cpp @@ -83,7 +83,7 @@ QQuickLabel::~QQuickLabel() } QQuickLabelPrivate::QQuickLabelPrivate() - : background(Q_NULLPTR), accessibleAttached(Q_NULLPTR) + : background(nullptr), accessibleAttached(nullptr) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); diff --git a/src/templates/qquicklabel_p.h b/src/templates/qquicklabel_p.h index 26f72840..7bb09d1b 100644 --- a/src/templates/qquicklabel_p.h +++ b/src/templates/qquicklabel_p.h @@ -62,7 +62,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickLabel : public QQuickText Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) public: - explicit QQuickLabel(QQuickItem *parent = Q_NULLPTR); + explicit QQuickLabel(QQuickItem *parent = nullptr); ~QQuickLabel(); QFont font() const; @@ -76,10 +76,10 @@ Q_SIGNALS: void backgroundChanged(); protected: - void classBegin() Q_DECL_OVERRIDE; + void classBegin() override; - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &value) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; private: Q_DISABLE_COPY(QQuickLabel) diff --git a/src/templates/qquicklabel_p_p.h b/src/templates/qquicklabel_p_p.h index a4e9f4e5..9d0ff05c 100644 --- a/src/templates/qquicklabel_p_p.h +++ b/src/templates/qquicklabel_p_p.h @@ -78,8 +78,8 @@ public: void _q_textChanged(const QString &text); #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif QQuickItem *background; diff --git a/src/templates/qquickmenu.cpp b/src/templates/qquickmenu.cpp index 692395ff..7aeebd2f 100644 --- a/src/templates/qquickmenu.cpp +++ b/src/templates/qquickmenu.cpp @@ -92,8 +92,8 @@ QT_BEGIN_NAMESPACE */ QQuickMenuPrivate::QQuickMenuPrivate() : - contentModel(Q_NULLPTR), - dummyFocusItem(Q_NULLPTR), + contentModel(nullptr), + dummyFocusItem(nullptr), ignoreActiveFocusChanges(false) { Q_Q(QQuickMenu); @@ -125,7 +125,7 @@ void QQuickMenuPrivate::removeItem(int index, QQuickItem *item) contentData.removeOne(item); QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Destroyed | QQuickItemPrivate::Parent); - item->setParentItem(Q_NULLPTR); + item->setParentItem(nullptr); contentModel->remove(index); } @@ -161,7 +161,7 @@ void QQuickMenuPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent) { // remove dynamically unparented items (eg. by a Repeater) if (!parent) - removeItem(contentModel->indexOf(item, Q_NULLPTR), item); + removeItem(contentModel->indexOf(item, nullptr), item); } void QQuickMenuPrivate::itemSiblingOrderChanged(QQuickItem *) @@ -171,14 +171,14 @@ void QQuickMenuPrivate::itemSiblingOrderChanged(QQuickItem *) QList<QQuickItem *> siblings = contentItem->childItems(); for (int i = 0; i < siblings.count(); ++i) { QQuickItem* sibling = siblings.at(i); - int index = contentModel->indexOf(sibling, Q_NULLPTR); + int index = contentModel->indexOf(sibling, nullptr); q->moveItem(index, i); } } void QQuickMenuPrivate::itemDestroyed(QQuickItem *item) { - int index = contentModel->indexOf(item, Q_NULLPTR); + int index = contentModel->indexOf(item, nullptr); if (index != -1) removeItem(index, item); } @@ -193,7 +193,7 @@ void QQuickMenuPrivate::onItemPressed() { Q_Q(QQuickMenu); QQuickItem *item = qobject_cast<QQuickItem*>(q->sender()); - int itemIndex = contentModel->indexOf(item, Q_NULLPTR); + int itemIndex = contentModel->indexOf(item, nullptr); Q_ASSERT(itemIndex != -1); if (!contentItem->property("currentIndex").isValid()) @@ -215,7 +215,7 @@ void QQuickMenuPrivate::onItemActiveFocusChanged() if (!contentItem->property("currentIndex").isValid()) return; - int indexOfItem = contentModel->indexOf(item, Q_NULLPTR); + int indexOfItem = contentModel->indexOf(item, nullptr); contentItem->setProperty("currentIndex", indexOfItem); } @@ -265,7 +265,7 @@ void QQuickMenuPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObj if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) { QQuickItemPrivate::get(item)->addItemChangeListener(p, QQuickItemPrivate::SiblingOrder); item->setParentItem(p->contentItem); - } else if (p->contentModel->indexOf(item, Q_NULLPTR) == -1) { + } else if (p->contentModel->indexOf(item, nullptr) == -1) { q->addItem(item); QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem *>(item); @@ -342,7 +342,7 @@ void QQuickMenu::insertItem(int index, QQuickItem *item) if (index < 0 || index > count) index = count; - int oldIndex = d->contentModel->indexOf(item, Q_NULLPTR); + int oldIndex = d->contentModel->indexOf(item, nullptr); if (oldIndex != -1) { if (oldIndex < index) --index; diff --git a/src/templates/qquickmenu_p.h b/src/templates/qquickmenu_p.h index 065ee1d7..ec417d16 100644 --- a/src/templates/qquickmenu_p.h +++ b/src/templates/qquickmenu_p.h @@ -67,7 +67,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickMenu : public QQuickPopup Q_CLASSINFO("DefaultProperty", "contentData") public: - explicit QQuickMenu(QObject *parent = Q_NULLPTR); + explicit QQuickMenu(QObject *parent = nullptr); Q_INVOKABLE QQuickItem *itemAt(int index) const; Q_INVOKABLE void addItem(QQuickItem *item); @@ -82,9 +82,9 @@ public: void setTitle(QString &title); protected: - void componentComplete() Q_DECL_OVERRIDE; - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + void componentComplete() override; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; + bool eventFilter(QObject *object, QEvent *event) override; Q_SIGNALS: void titleChanged(); diff --git a/src/templates/qquickmenu_p_p.h b/src/templates/qquickmenu_p_p.h index 167f865b..505f3cb9 100644 --- a/src/templates/qquickmenu_p_p.h +++ b/src/templates/qquickmenu_p_p.h @@ -73,11 +73,11 @@ public: void resizeItem(QQuickItem *item); void resizeItems(); - void itemChildAdded(QQuickItem *item, QQuickItem *child) Q_DECL_OVERRIDE; - void itemSiblingOrderChanged(QQuickItem *item) Q_DECL_OVERRIDE; - void itemParentChanged(QQuickItem *item, QQuickItem *parent) Q_DECL_OVERRIDE; - void itemDestroyed(QQuickItem *item) Q_DECL_OVERRIDE; - void itemGeometryChanged(QQuickItem *, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemChildAdded(QQuickItem *item, QQuickItem *child) override; + void itemSiblingOrderChanged(QQuickItem *item) override; + void itemParentChanged(QQuickItem *item, QQuickItem *parent) override; + void itemDestroyed(QQuickItem *item) override; + void itemGeometryChanged(QQuickItem *, const QRectF &newGeometry, const QRectF &oldGeometry) override; void onItemPressed(); void onItemActiveFocusChanged(); diff --git a/src/templates/qquickmenuitem_p.h b/src/templates/qquickmenuitem_p.h index 91d1e91e..812597be 100644 --- a/src/templates/qquickmenuitem_p.h +++ b/src/templates/qquickmenuitem_p.h @@ -59,16 +59,16 @@ class Q_LABSTEMPLATES_EXPORT QQuickMenuItem : public QQuickAbstractButton Q_OBJECT public: - explicit QQuickMenuItem(QQuickItem *parent = Q_NULLPTR); + explicit QQuickMenuItem(QQuickItem *parent = nullptr); Q_SIGNALS: void triggered(); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickoverlay.cpp b/src/templates/qquickoverlay.cpp index 589cafdf..23895d9c 100644 --- a/src/templates/qquickoverlay.cpp +++ b/src/templates/qquickoverlay.cpp @@ -134,7 +134,7 @@ void QQuickOverlayPrivate::resizeBackground() } QQuickOverlayPrivate::QQuickOverlayPrivate() : - background(Q_NULLPTR), + background(nullptr), modalPopups(0) { } @@ -177,7 +177,7 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data) Q_D(QQuickOverlay); QQuickItem::itemChange(change, data); - QQuickPopup *popup = Q_NULLPTR; + QQuickPopup *popup = nullptr; if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { QQuickDrawer *drawer = qobject_cast<QQuickDrawer *>(data.item); if (drawer) { diff --git a/src/templates/qquickoverlay_p.h b/src/templates/qquickoverlay_p.h index 6a4d56b3..f5ce54f6 100644 --- a/src/templates/qquickoverlay_p.h +++ b/src/templates/qquickoverlay_p.h @@ -61,7 +61,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickOverlay : public QQuickItem Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) public: - explicit QQuickOverlay(QQuickItem *parent = Q_NULLPTR); + explicit QQuickOverlay(QQuickItem *parent = nullptr); QQuickItem *background() const; void setBackground(QQuickItem *background); @@ -72,16 +72,16 @@ Q_SIGNALS: void released(); protected: - void itemChange(ItemChange change, const ItemChangeData &data) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &oldGeometry, const QRectF &newGeometry) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &data) override; + void geometryChanged(const QRectF &oldGeometry, const QRectF &newGeometry) override; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; - bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; + bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; private: Q_DISABLE_COPY(QQuickOverlay) diff --git a/src/templates/qquickpage.cpp b/src/templates/qquickpage.cpp index 8302dca0..da40a00c 100644 --- a/src/templates/qquickpage.cpp +++ b/src/templates/qquickpage.cpp @@ -36,6 +36,8 @@ #include "qquickpage_p.h" #include "qquickcontrol_p_p.h" +#include "qquicktoolbar_p.h" +#include "qquicktabbar_p.h" #include <QtQuick/private/qquickitemchangelistener_p.h> @@ -91,14 +93,14 @@ public: void relayout(); - void itemImplicitWidthChanged(QQuickItem *item) Q_DECL_OVERRIDE; - void itemImplicitHeightChanged(QQuickItem *item) Q_DECL_OVERRIDE; + void itemImplicitWidthChanged(QQuickItem *item) override; + void itemImplicitHeightChanged(QQuickItem *item) override; QQuickItem *header; QQuickItem *footer; }; -QQuickPagePrivate::QQuickPagePrivate() : header(Q_NULLPTR), footer(Q_NULLPTR) +QQuickPagePrivate::QQuickPagePrivate() : header(nullptr), footer(nullptr) { } @@ -148,6 +150,9 @@ QQuickPage::QQuickPage(QQuickItem *parent) : This property holds the page header item. The header item is positioned to the top, and resized to the width of the page. The default value is \c null. + \note Assigning a ToolBar or TabBar as a page header sets the respective + \l ToolBar::position or \l TabBar::position property automatically to \c Header. + \sa footer, ApplicationWindow::header */ QQuickItem *QQuickPage::header() const @@ -169,6 +174,10 @@ void QQuickPage::setHeader(QQuickItem *header) p->addItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (qFuzzyIsNull(header->z())) header->setZ(1); + if (QQuickToolBar *toolBar = qobject_cast<QQuickToolBar *>(header)) + toolBar->setPosition(QQuickToolBar::Header); + else if (QQuickTabBar *tabBar = qobject_cast<QQuickTabBar *>(header)) + tabBar->setPosition(QQuickTabBar::Header); if (isComponentComplete()) d->relayout(); } @@ -182,6 +191,9 @@ void QQuickPage::setHeader(QQuickItem *header) This property holds the page footer item. The footer item is positioned to the bottom, and resized to the width of the page. The default value is \c null. + \note Assigning a ToolBar or TabBar as a page footer sets the respective + \l ToolBar::position or \l TabBar::position property automatically to \c Footer. + \sa header, ApplicationWindow::footer */ QQuickItem *QQuickPage::footer() const @@ -203,6 +215,10 @@ void QQuickPage::setFooter(QQuickItem *footer) p->addItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); if (qFuzzyIsNull(footer->z())) footer->setZ(1); + if (QQuickToolBar *toolBar = qobject_cast<QQuickToolBar *>(footer)) + toolBar->setPosition(QQuickToolBar::Footer); + else if (QQuickTabBar *tabBar = qobject_cast<QQuickTabBar *>(footer)) + tabBar->setPosition(QQuickTabBar::Footer); if (isComponentComplete()) d->relayout(); } @@ -221,7 +237,7 @@ void QQuickPage::setFooter(QQuickItem *footer) QQmlListProperty<QObject> QQuickPage::contentData() { Q_D(QQuickPage); - return QQmlListProperty<QObject>(d->contentItem, Q_NULLPTR, + return QQmlListProperty<QObject>(d->contentItem, nullptr, QQuickItemPrivate::data_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, @@ -238,7 +254,7 @@ QQmlListProperty<QObject> QQuickPage::contentData() QQmlListProperty<QQuickItem> QQuickPage::contentChildren() { Q_D(QQuickPage); - return QQmlListProperty<QQuickItem>(d->contentItem, Q_NULLPTR, + return QQmlListProperty<QQuickItem>(d->contentItem, nullptr, QQuickItemPrivate::children_append, QQuickItemPrivate::children_count, QQuickItemPrivate::children_at, diff --git a/src/templates/qquickpage_p.h b/src/templates/qquickpage_p.h index 157f0507..c21bb0ac 100644 --- a/src/templates/qquickpage_p.h +++ b/src/templates/qquickpage_p.h @@ -65,7 +65,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickPage : public QQuickControl Q_CLASSINFO("DefaultProperty", "contentData") public: - explicit QQuickPage(QQuickItem *parent = Q_NULLPTR); + explicit QQuickPage(QQuickItem *parent = nullptr); QQuickItem *header() const; void setHeader(QQuickItem *header); @@ -82,12 +82,12 @@ Q_SIGNALS: void contentChildrenChanged(); protected: - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) Q_DECL_OVERRIDE; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp index a360627e..1333c245 100644 --- a/src/templates/qquickpageindicator.cpp +++ b/src/templates/qquickpageindicator.cpp @@ -70,7 +70,7 @@ class QQuickPageIndicatorPrivate : public QQuickControlPrivate, public QQuickIte public: QQuickPageIndicatorPrivate() : count(0), currentIndex(0), - interactive(false), delegate(Q_NULLPTR), pressedItem(Q_NULLPTR) + interactive(false), delegate(nullptr), pressedItem(nullptr) { } @@ -91,7 +91,7 @@ QQuickItem *QQuickPageIndicatorPrivate::itemAt(const QPoint &pos) const { Q_Q(const QQuickPageIndicator); if (!contentItem || !q->contains(pos)) - return Q_NULLPTR; + return nullptr; QPointF contentPos = q->mapToItem(contentItem, pos); QQuickItem *item = contentItem->childAt(contentPos.x(), contentPos.y()); @@ -102,8 +102,9 @@ QQuickItem *QQuickPageIndicatorPrivate::itemAt(const QPoint &pos) const // find the nearest qreal distance = qInf(); - QQuickItem *nearest = Q_NULLPTR; - foreach (QQuickItem *child, contentItem->childItems()) { + QQuickItem *nearest = nullptr; + const auto childItems = contentItem->childItems(); + for (QQuickItem *child : childItems) { if (QQuickItemPrivate::get(child)->isTransparentForPositioner()) continue; @@ -122,7 +123,7 @@ QQuickItem *QQuickPageIndicatorPrivate::itemAt(const QPoint &pos) const void QQuickPageIndicatorPrivate::updatePressed(bool pressed, const QPoint &pos) { QQuickItem *prevItem = pressedItem; - pressedItem = pressed ? itemAt(pos) : Q_NULLPTR; + pressedItem = pressed ? itemAt(pos) : nullptr; if (prevItem != pressedItem) { setContextProperty(prevItem, QStringLiteral("pressed"), false); setContextProperty(pressedItem, QStringLiteral("pressed"), pressed); diff --git a/src/templates/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h index 487b4d6e..b776cbb6 100644 --- a/src/templates/qquickpageindicator_p.h +++ b/src/templates/qquickpageindicator_p.h @@ -64,7 +64,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: - explicit QQuickPageIndicator(QQuickItem *parent = Q_NULLPTR); + explicit QQuickPageIndicator(QQuickItem *parent = nullptr); int count() const; void setCount(int count); @@ -85,15 +85,15 @@ Q_SIGNALS: void delegateChanged(); protected: - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickpane.cpp b/src/templates/qquickpane.cpp index 9bedb150..c660220c 100644 --- a/src/templates/qquickpane.cpp +++ b/src/templates/qquickpane.cpp @@ -142,7 +142,7 @@ void QQuickPane::setContentHeight(qreal height) QQmlListProperty<QObject> QQuickPane::contentData() { Q_D(QQuickPane); - return QQmlListProperty<QObject>(d->contentItem, Q_NULLPTR, + return QQmlListProperty<QObject>(d->contentItem, nullptr, QQuickItemPrivate::data_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, @@ -159,7 +159,7 @@ QQmlListProperty<QObject> QQuickPane::contentData() QQmlListProperty<QQuickItem> QQuickPane::contentChildren() { Q_D(QQuickPane); - return QQmlListProperty<QQuickItem>(d->contentItem, Q_NULLPTR, + return QQmlListProperty<QQuickItem>(d->contentItem, nullptr, QQuickItemPrivate::children_append, QQuickItemPrivate::children_count, QQuickItemPrivate::children_at, diff --git a/src/templates/qquickpane_p.h b/src/templates/qquickpane_p.h index e599f55f..51039f32 100644 --- a/src/templates/qquickpane_p.h +++ b/src/templates/qquickpane_p.h @@ -65,7 +65,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickPane : public QQuickControl Q_CLASSINFO("DefaultProperty", "contentData") public: - explicit QQuickPane(QQuickItem *parent = Q_NULLPTR); + explicit QQuickPane(QQuickItem *parent = nullptr); qreal contentWidth() const; void setContentWidth(qreal width); @@ -84,10 +84,10 @@ Q_SIGNALS: protected: QQuickPane(QQuickPanePrivate &dd, QQuickItem *parent); - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp index 2db7488c..ea74743a 100644 --- a/src/templates/qquickpopup.cpp +++ b/src/templates/qquickpopup.cpp @@ -83,13 +83,13 @@ QQuickPopupPrivate::QQuickPopupPrivate() , contentWidth(0) , contentHeight(0) , closePolicy(QQuickPopup::OnEscape) - , parentItem(Q_NULLPTR) - , background(Q_NULLPTR) - , contentItem(Q_NULLPTR) - , overlay(Q_NULLPTR) - , enter(Q_NULLPTR) - , exit(Q_NULLPTR) - , popupItem(Q_NULLPTR) + , parentItem(nullptr) + , background(nullptr) + , contentItem(nullptr) + , overlay(nullptr) + , enter(nullptr) + , exit(nullptr) + , popupItem(nullptr) , positioner(this) , transitionManager(this) { @@ -112,9 +112,9 @@ void QQuickPopupPrivate::finalizeEnterTransition() void QQuickPopupPrivate::finalizeExitTransition() { Q_Q(QQuickPopup); - overlay = Q_NULLPTR; - positioner.setParentItem(Q_NULLPTR); - popupItem->setParentItem(Q_NULLPTR); + overlay = nullptr; + positioner.setParentItem(nullptr); + popupItem->setParentItem(nullptr); emit q->visibleChanged(); } @@ -206,8 +206,8 @@ class QQuickPopupItemPrivate : public QQuickItemPrivate public: QQuickPopupItemPrivate(QQuickPopup *popup); - void implicitWidthChanged() Q_DECL_OVERRIDE; - void implicitHeightChanged() Q_DECL_OVERRIDE; + void implicitWidthChanged() override; + void implicitHeightChanged() override; QQuickPopup *popup; }; @@ -301,7 +301,7 @@ void QQuickPopupItem::geometryChanged(const QRectF &newGeometry, const QRectF &o QQuickPopupPositioner::QQuickPopupPositioner(QQuickPopupPrivate *popup) : m_x(0), m_y(0), - m_parentItem(Q_NULLPTR), + m_parentItem(nullptr), m_popup(popup) { } @@ -386,7 +386,7 @@ void QQuickPopupPositioner::itemDestroyed(QQuickItem *item) { Q_ASSERT(m_parentItem == item); - m_parentItem = Q_NULLPTR; + m_parentItem = nullptr; QQuickItemPrivate::get(item)->removeItemChangeListener(this, ItemChangeTypes); removeAncestorListeners(item->parentItem()); } @@ -502,7 +502,7 @@ QQuickPopup::QQuickPopup(QQuickPopupPrivate &dd, QObject *parent) QQuickPopup::~QQuickPopup() { Q_D(QQuickPopup); - d->positioner.setParentItem(Q_NULLPTR); + d->positioner.setParentItem(nullptr); delete d->popupItem; } @@ -519,7 +519,7 @@ void QQuickPopup::open() return; } - QQuickWindow *window = Q_NULLPTR; + QQuickWindow *window = nullptr; QObject *p = parent(); while (p && !window) { if (QQuickItem *item = qobject_cast<QQuickItem *>(p)) { @@ -1015,7 +1015,7 @@ void QQuickPopup::setContentItem(QQuickItem *item) QQmlListProperty<QObject> QQuickPopup::contentData() { Q_D(QQuickPopup); - return QQmlListProperty<QObject>(d->contentItem, Q_NULLPTR, + return QQmlListProperty<QObject>(d->contentItem, nullptr, QQuickItemPrivate::data_append, QQuickItemPrivate::data_count, QQuickItemPrivate::data_at, @@ -1032,7 +1032,7 @@ QQmlListProperty<QObject> QQuickPopup::contentData() QQmlListProperty<QQuickItem> QQuickPopup::contentChildren() { Q_D(QQuickPopup); - return QQmlListProperty<QQuickItem>(d->contentItem, Q_NULLPTR, + return QQmlListProperty<QQuickItem>(d->contentItem, nullptr, QQuickItemPrivate::children_append, QQuickItemPrivate::children_count, QQuickItemPrivate::children_at, @@ -1087,7 +1087,7 @@ void QQuickPopup::setModal(bool modal) bool QQuickPopup::isVisible() const { Q_D(const QQuickPopup); - return d->overlay != Q_NULLPTR /*&& !d->transitionManager.isRunning()*/; + return d->overlay != nullptr /*&& !d->transitionManager.isRunning()*/; } void QQuickPopup::setVisible(bool visible) @@ -1196,20 +1196,6 @@ void QQuickPopup::setExit(QQuickTransition *transition) emit exitChanged(); } -/*! - \qmlproperty list<Object> Qt.labs.controls::Popup::data - \default - - This property holds the list of data. - - \sa Item::data -*/ -QQmlListProperty<QObject> QQuickPopup::data() -{ - Q_D(QQuickPopup); - return QQuickItemPrivate::get(d->popupItem)->data(); -} - void QQuickPopup::classBegin() { } diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h index 6c51c46a..233978c8 100644 --- a/src/templates/qquickpopup_p.h +++ b/src/templates/qquickpopup_p.h @@ -97,7 +97,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStat Q_CLASSINFO("DefaultProperty", "contentData") public: - explicit QQuickPopup(QObject *parent = Q_NULLPTR); + explicit QQuickPopup(QObject *parent = nullptr); ~QQuickPopup(); qreal x() const; @@ -203,8 +203,6 @@ public: QQuickTransition *exit() const; void setExit(QQuickTransition *transition); - QQmlListProperty<QObject> data(); - public Q_SLOTS: void open(); void close(); @@ -242,8 +240,8 @@ Q_SIGNALS: protected: QQuickPopup(QQuickPopupPrivate &dd, QObject *parent); - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; bool isComponentComplete() const; virtual void focusInEvent(QFocusEvent *event); diff --git a/src/templates/qquickpopup_p_p.h b/src/templates/qquickpopup_p_p.h index f5aac221..5817cbd5 100644 --- a/src/templates/qquickpopup_p_p.h +++ b/src/templates/qquickpopup_p_p.h @@ -73,7 +73,7 @@ public: void transitionExit(); protected: - void finished() Q_DECL_OVERRIDE; + void finished() override; private: enum TransitionState { @@ -92,18 +92,18 @@ public: explicit QQuickPopupItem(QQuickPopup *popup); protected: - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; - - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void wheelEvent(QWheelEvent *event) override; + + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; private: Q_DECLARE_PRIVATE(QQuickPopupItem) diff --git a/src/templates/qquickpressandholdhelper.cpp b/src/templates/qquickpressandholdhelper.cpp index 29b3bb0a..6f3ddcbc 100644 --- a/src/templates/qquickpressandholdhelper.cpp +++ b/src/templates/qquickpressandholdhelper.cpp @@ -45,10 +45,10 @@ QT_BEGIN_NAMESPACE QQuickPressAndHoldHelper::QQuickPressAndHoldHelper() - : control(Q_NULLPTR) + : control(nullptr) , longPress(false) , pressAndHoldSignalIndex(-1) - , delayedMousePressEvent(Q_NULLPTR) + , delayedMousePressEvent(nullptr) { } void QQuickPressAndHoldHelper::mousePressEvent(QMouseEvent *event) @@ -91,7 +91,7 @@ void QQuickPressAndHoldHelper::timerEvent(QTimerEvent *) mev.setAccepted(true); // Use fast signal invocation since we already got its index QQuickMouseEvent *mevPtr = &mev; - void *args[] = { Q_NULLPTR, &mevPtr }; + void *args[] = { nullptr, &mevPtr }; QMetaObject::metacall(control, QMetaObject::InvokeMetaMethod, pressAndHoldSignalIndex, args); if (!mev.isAccepted()) longPress = false; diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp index 972654ad..cd490f50 100644 --- a/src/templates/qquickprogressbar.cpp +++ b/src/templates/qquickprogressbar.cpp @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE class QQuickProgressBarPrivate : public QQuickControlPrivate { public: - QQuickProgressBarPrivate() : from(0), to(1.0), value(0), indeterminate(false), indicator(Q_NULLPTR) + QQuickProgressBarPrivate() : from(0), to(1.0), value(0), indeterminate(false), indicator(nullptr) { } diff --git a/src/templates/qquickprogressbar_p.h b/src/templates/qquickprogressbar_p.h index f94c718e..1bf21b41 100644 --- a/src/templates/qquickprogressbar_p.h +++ b/src/templates/qquickprogressbar_p.h @@ -66,7 +66,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) public: - explicit QQuickProgressBar(QQuickItem *parent = Q_NULLPTR); + explicit QQuickProgressBar(QQuickItem *parent = nullptr); qreal from() const; void setFrom(qreal from); @@ -96,11 +96,11 @@ Q_SIGNALS: void indicatorChanged(); protected: - void mirrorChange() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void mirrorChange() override; + void componentComplete() override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickradiobutton_p.h b/src/templates/qquickradiobutton_p.h index 7d664864..2b9821aa 100644 --- a/src/templates/qquickradiobutton_p.h +++ b/src/templates/qquickradiobutton_p.h @@ -57,13 +57,13 @@ class Q_LABSTEMPLATES_EXPORT QQuickRadioButton : public QQuickAbstractButton Q_OBJECT public: - explicit QQuickRadioButton(QQuickItem *parent = Q_NULLPTR); + explicit QQuickRadioButton(QQuickItem *parent = nullptr); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif }; diff --git a/src/templates/qquickrangeslider.cpp b/src/templates/qquickrangeslider.cpp index 4bb320cf..0dec63cb 100644 --- a/src/templates/qquickrangeslider.cpp +++ b/src/templates/qquickrangeslider.cpp @@ -87,7 +87,7 @@ public: isPendingValue(false), pendingValue(0), position(0), - handle(Q_NULLPTR), + handle(nullptr), slider(slider), pressed(false) { @@ -297,11 +297,11 @@ public: from(defaultFrom), to(defaultTo), stepSize(0), - first(Q_NULLPTR), - second(Q_NULLPTR), + first(nullptr), + second(nullptr), orientation(Qt::Horizontal), snapMode(QQuickRangeSlider::NoSnap), - track(Q_NULLPTR) + track(nullptr) { } @@ -692,7 +692,7 @@ void QQuickRangeSlider::keyPressEvent(QKeyEvent *event) QQuickControl::keyPressEvent(event); QQuickRangeSliderNode *focusNode = d->first->handle()->hasActiveFocus() - ? d->first : (d->second->handle()->hasActiveFocus() ? d->second : Q_NULLPTR); + ? d->first : (d->second->handle()->hasActiveFocus() ? d->second : nullptr); if (!focusNode) return; @@ -743,8 +743,8 @@ void QQuickRangeSlider::mousePressEvent(QMouseEvent *event) QQuickItem *secondHandle = d->second->handle(); const bool firstHit = firstHandle && firstHandle->contains(mapToItem(firstHandle, d->pressPoint)); const bool secondHit = secondHandle && secondHandle->contains(mapToItem(secondHandle, d->pressPoint)); - QQuickRangeSliderNode *hitNode = Q_NULLPTR; - QQuickRangeSliderNode *otherNode = Q_NULLPTR; + QQuickRangeSliderNode *hitNode = nullptr; + QQuickRangeSliderNode *otherNode = nullptr; if (firstHit && secondHit) { // choose highest @@ -777,7 +777,7 @@ void QQuickRangeSlider::mouseMoveEvent(QMouseEvent *event) setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->pos().y() - d->pressPoint.y(), Qt::YAxis, event)); } if (keepMouseGrab()) { - QQuickRangeSliderNode *pressedNode = d->first->isPressed() ? d->first : (d->second->isPressed() ? d->second : Q_NULLPTR); + QQuickRangeSliderNode *pressedNode = d->first->isPressed() ? d->first : (d->second->isPressed() ? d->second : nullptr); if (pressedNode) { qreal pos = positionAt(this, pressedNode->handle(), event->pos()); if (d->snapMode == SnapAlways) @@ -796,7 +796,7 @@ void QQuickRangeSlider::mouseReleaseEvent(QMouseEvent *event) if (!keepMouseGrab()) return; - QQuickRangeSliderNode *pressedNode = d->first->isPressed() ? d->first : (d->second->isPressed() ? d->second : Q_NULLPTR); + QQuickRangeSliderNode *pressedNode = d->first->isPressed() ? d->first : (d->second->isPressed() ? d->second : nullptr); if (!pressedNode) return; diff --git a/src/templates/qquickrangeslider_p.h b/src/templates/qquickrangeslider_p.h index 604666c8..24653b0e 100644 --- a/src/templates/qquickrangeslider_p.h +++ b/src/templates/qquickrangeslider_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickRangeSlider : public QQuickControl Q_PROPERTY(QQuickItem *track READ track WRITE setTrack NOTIFY trackChanged FINAL) public: - explicit QQuickRangeSlider(QQuickItem *parent = Q_NULLPTR); + explicit QQuickRangeSlider(QQuickItem *parent = nullptr); qreal from() const; void setFrom(qreal from); @@ -109,17 +109,17 @@ Q_SIGNALS: void trackChanged(); protected: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void mirrorChange() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void mirrorChange() override; + void componentComplete() override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index 86d4e290..ad7b0a6d 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -83,7 +83,7 @@ class QQuickScrollBarPrivate : public QQuickControlPrivate public: QQuickScrollBarPrivate() : size(0), position(0), offset(0), active(false), pressed(false), moving(false), - orientation(Qt::Vertical), handle(Q_NULLPTR) + orientation(Qt::Vertical), handle(nullptr) { } @@ -116,7 +116,7 @@ QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object) return new QQuickScrollBarAttached(flickable); qWarning() << "ScrollBar must be attached to a Flickable" << object; - return Q_NULLPTR; + return nullptr; } /*! @@ -309,7 +309,7 @@ QAccessible::Role QQuickScrollBar::accessibleRole() const class QQuickScrollBarAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollBarAttachedPrivate(QQuickFlickable *flickable) : flickable(flickable), horizontal(Q_NULLPTR), vertical(Q_NULLPTR) { } + QQuickScrollBarAttachedPrivate(QQuickFlickable *flickable) : flickable(flickable), horizontal(nullptr), vertical(nullptr) { } void activateHorizontal(); void activateVertical(); @@ -319,7 +319,7 @@ public: void layoutHorizontal(bool move = true); void layoutVertical(bool move = true); - void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override; QQuickFlickable *flickable; QQuickScrollBar *horizontal; diff --git a/src/templates/qquickscrollbar_p.h b/src/templates/qquickscrollbar_p.h index b944f92a..6eb8b798 100644 --- a/src/templates/qquickscrollbar_p.h +++ b/src/templates/qquickscrollbar_p.h @@ -67,7 +67,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) public: - explicit QQuickScrollBar(QQuickItem *parent = Q_NULLPTR); + explicit QQuickScrollBar(QQuickItem *parent = nullptr); static QQuickScrollBarAttached *qmlAttachedProperties(QObject *object); @@ -99,15 +99,15 @@ Q_SIGNALS: void handleChanged(); protected: - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; virtual qreal positionAt(const QPoint &point) const; #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp index 4dc04141..5e210f09 100644 --- a/src/templates/qquickscrollindicator.cpp +++ b/src/templates/qquickscrollindicator.cpp @@ -82,7 +82,7 @@ class QQuickScrollIndicatorPrivate : public QQuickControlPrivate { public: QQuickScrollIndicatorPrivate() : size(0), position(0), - active(false), orientation(Qt::Vertical), indicator(Q_NULLPTR) + active(false), orientation(Qt::Vertical), indicator(nullptr) { } @@ -105,7 +105,7 @@ QQuickScrollIndicatorAttached *QQuickScrollIndicator::qmlAttachedProperties(QObj return new QQuickScrollIndicatorAttached(flickable); qWarning() << "ScrollIndicator must be attached to a Flickable" << object; - return Q_NULLPTR; + return nullptr; } /*! @@ -225,7 +225,7 @@ void QQuickScrollIndicator::setIndicator(QQuickItem *indicator) class QQuickScrollIndicatorAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener { public: - QQuickScrollIndicatorAttachedPrivate(QQuickFlickable *flickable) : flickable(flickable), horizontal(Q_NULLPTR), vertical(Q_NULLPTR) { } + QQuickScrollIndicatorAttachedPrivate(QQuickFlickable *flickable) : flickable(flickable), horizontal(nullptr), vertical(nullptr) { } void activateHorizontal(); void activateVertical(); @@ -233,7 +233,7 @@ public: void layoutHorizontal(bool move = true); void layoutVertical(bool move = true); - void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override; QQuickFlickable *flickable; QQuickScrollIndicator *horizontal; diff --git a/src/templates/qquickscrollindicator_p.h b/src/templates/qquickscrollindicator_p.h index 1f5f07b7..15002700 100644 --- a/src/templates/qquickscrollindicator_p.h +++ b/src/templates/qquickscrollindicator_p.h @@ -66,7 +66,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) public: - explicit QQuickScrollIndicator(QQuickItem *parent = Q_NULLPTR); + explicit QQuickScrollIndicator(QQuickItem *parent = nullptr); static QQuickScrollIndicatorAttached *qmlAttachedProperties(QObject *object); @@ -95,7 +95,7 @@ Q_SIGNALS: protected: #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index e59b46e6..b109fc5a 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -80,7 +80,7 @@ class QQuickSliderPrivate : public QQuickControlPrivate public: QQuickSliderPrivate() : from(0), to(1), value(0), position(0), stepSize(0), pressed(false), orientation(Qt::Horizontal), snapMode(QQuickSlider::NoSnap), - handle(Q_NULLPTR), track(Q_NULLPTR) + handle(nullptr), track(nullptr) { } diff --git a/src/templates/qquickslider_p.h b/src/templates/qquickslider_p.h index 663ad684..b348baa9 100644 --- a/src/templates/qquickslider_p.h +++ b/src/templates/qquickslider_p.h @@ -70,7 +70,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickSlider : public QQuickControl Q_PROPERTY(QQuickItem *track READ track WRITE setTrack NOTIFY trackChanged FINAL) public: - explicit QQuickSlider(QQuickItem *parent = Q_NULLPTR); + explicit QQuickSlider(QQuickItem *parent = nullptr); qreal from() const; void setFrom(qreal from); @@ -127,18 +127,18 @@ Q_SIGNALS: void trackChanged(); protected: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void mirrorChange() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void mirrorChange() override; + void componentComplete() override; #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickspinbox.cpp b/src/templates/qquickspinbox.cpp index 33ea6e79..31368a1a 100644 --- a/src/templates/qquickspinbox.cpp +++ b/src/templates/qquickspinbox.cpp @@ -91,7 +91,7 @@ class QQuickSpinBoxPrivate : public QQuickControlPrivate public: QQuickSpinBoxPrivate() : from(0), to(99), value(0), stepSize(1), - delayTimer(0), repeatTimer(0), up(Q_NULLPTR), down(Q_NULLPTR), validator(Q_NULLPTR) { } + delayTimer(0), repeatTimer(0), up(nullptr), down(nullptr), validator(nullptr) { } int boundValue(int value) const; void updateValue(); @@ -625,7 +625,7 @@ QAccessible::Role QQuickSpinBox::accessibleRole() const class QQuickSpinButtonPrivate : public QObjectPrivate { public: - QQuickSpinButtonPrivate() : pressed(false), indicator(Q_NULLPTR) { } + QQuickSpinButtonPrivate() : pressed(false), indicator(nullptr) { } bool pressed; QQuickItem *indicator; }; diff --git a/src/templates/qquickspinbox_p.h b/src/templates/qquickspinbox_p.h index 0ad5e70d..5d05c25b 100644 --- a/src/templates/qquickspinbox_p.h +++ b/src/templates/qquickspinbox_p.h @@ -72,7 +72,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickSpinBox : public QQuickControl Q_PROPERTY(QQuickSpinButton *down READ down CONSTANT FINAL) public: - explicit QQuickSpinBox(QQuickItem *parent = Q_NULLPTR); + explicit QQuickSpinBox(QQuickItem *parent = nullptr); int from() const; void setFrom(int from); @@ -112,21 +112,21 @@ Q_SIGNALS: void valueFromTextChanged(); protected: - bool childMouseEventFilter(QQuickItem *child, QEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - - void componentComplete() Q_DECL_OVERRIDE; - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; + bool childMouseEventFilter(QQuickItem *child, QEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void timerEvent(QTimerEvent *event) override; + + void componentComplete() override; + void itemChange(ItemChange change, const ItemChangeData &value) override; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index d5e2aee3..b338f3bf 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -272,7 +272,7 @@ QQuickStackView::~QQuickStackView() { Q_D(QQuickStackView); if (d->transitioner) { - d->transitioner->setChangeListener(Q_NULLPTR); + d->transitioner->setChangeListener(nullptr); delete d->transitioner; } qDeleteAll(d->removals); @@ -284,7 +284,7 @@ QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object) QQuickItem *item = qobject_cast<QQuickItem *>(object); if (!item) { qmlInfo(object) << "StackView must be attached to an Item"; - return Q_NULLPTR; + return nullptr; } return new QQuickStackAttached(item); } @@ -341,7 +341,7 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior) element->load(this); return element->item; } - return Q_NULLPTR; + return nullptr; } /*! @@ -367,7 +367,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio QJSValue func(callback); QQmlEngine *engine = qmlEngine(this); if (!engine || !func.isCallable()) // TODO: warning? - return Q_NULLPTR; + return nullptr; for (int i = d->elements.count() - 1; i >= 0; --i) { QQuickStackElement *element = d->elements.at(i); @@ -380,7 +380,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio } } - return Q_NULLPTR; + return nullptr; } /*! @@ -451,7 +451,7 @@ void QQuickStackView::push(QQmlV4Function *args) return; } - QQuickStackElement *exit = Q_NULLPTR; + QQuickStackElement *exit = nullptr; if (!d->elements.isEmpty()) exit = d->elements.top(); @@ -535,7 +535,7 @@ void QQuickStackView::pop(QQmlV4Function *args) operation = static_cast<Operation>(lastArg->toInt32()); } - QQuickItem *previousItem = Q_NULLPTR; + QQuickItem *previousItem = nullptr; if (d->popElements(enter)) { if (exit) @@ -618,7 +618,7 @@ void QQuickStackView::replace(QQmlV4Function *args) if (lastArg->isInt32()) operation = static_cast<Operation>(lastArg->toInt32()); - QQuickStackElement *target = Q_NULLPTR; + QQuickStackElement *target = nullptr; QV4::ScopedValue firstArg(scope, (*args)[0]); if (firstArg->isNull()) target = d->elements.value(0); @@ -633,7 +633,7 @@ void QQuickStackView::replace(QQmlV4Function *args) } int depth = d->elements.count(); - QQuickStackElement* exit = Q_NULLPTR; + QQuickStackElement* exit = nullptr; if (!d->elements.isEmpty()) exit = d->elements.pop(); @@ -661,7 +661,7 @@ void QQuickStackView::replace(QQmlV4Function *args) void QQuickStackView::clear() { Q_D(QQuickStackView); - d->setCurrentItem(Q_NULLPTR); + d->setCurrentItem(nullptr); qDeleteAll(d->elements); d->elements.clear(); emit depthChanged(); @@ -704,7 +704,7 @@ QQuickTransition *QQuickStackView::popEnter() const Q_D(const QQuickStackView); if (d->transitioner) return d->transitioner->removeDisplacedTransition; - return Q_NULLPTR; + return nullptr; } void QQuickStackView::setPopEnter(QQuickTransition *enter) @@ -730,7 +730,7 @@ QQuickTransition *QQuickStackView::popExit() const Q_D(const QQuickStackView); if (d->transitioner) return d->transitioner->removeTransition; - return Q_NULLPTR; + return nullptr; } void QQuickStackView::setPopExit(QQuickTransition *exit) @@ -756,7 +756,7 @@ QQuickTransition *QQuickStackView::pushEnter() const Q_D(const QQuickStackView); if (d->transitioner) return d->transitioner->addTransition; - return Q_NULLPTR; + return nullptr; } void QQuickStackView::setPushEnter(QQuickTransition *enter) @@ -782,7 +782,7 @@ QQuickTransition *QQuickStackView::pushExit() const Q_D(const QQuickStackView); if (d->transitioner) return d->transitioner->addDisplacedTransition; - return Q_NULLPTR; + return nullptr; } void QQuickStackView::setPushExit(QQuickTransition *exit) @@ -808,7 +808,7 @@ QQuickTransition *QQuickStackView::replaceEnter() const Q_D(const QQuickStackView); if (d->transitioner) return d->transitioner->moveTransition; - return Q_NULLPTR; + return nullptr; } void QQuickStackView::setReplaceEnter(QQuickTransition *enter) @@ -834,7 +834,7 @@ QQuickTransition *QQuickStackView::replaceExit() const Q_D(const QQuickStackView); if (d->transitioner) return d->transitioner->moveDisplacedTransition; - return Q_NULLPTR; + return nullptr; } void QQuickStackView::setReplaceExit(QQuickTransition *exit) @@ -852,7 +852,7 @@ void QQuickStackView::componentComplete() QQuickControl::componentComplete(); Q_D(QQuickStackView); - QQuickStackElement *element = Q_NULLPTR; + QQuickStackElement *element = nullptr; if (QObject *o = d->initialItem.value<QObject *>()) element = QQuickStackElement::fromObject(o, this); else if (d->initialItem.canConvert<QString>()) @@ -869,7 +869,7 @@ void QQuickStackView::geometryChanged(const QRectF &newGeometry, const QRectF &o QQuickControl::geometryChanged(newGeometry, oldGeometry); Q_D(QQuickStackView); - foreach (QQuickStackElement *element, d->elements) { + for (QQuickStackElement *element : qAsConst(d->elements)) { if (element->item) { if (!element->widthValid) element->item->setWidth(newGeometry.width()); @@ -897,11 +897,11 @@ void QQuickStackAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem { Q_Q(QQuickStackAttached); int oldIndex = element ? element->index : -1; - QQuickStackView *oldView = element ? element->view : Q_NULLPTR; + QQuickStackView *oldView = element ? element->view : nullptr; QQuickStackView::Status oldStatus = element ? element->status : QQuickStackView::Inactive; QQuickStackView *newView = qobject_cast<QQuickStackView *>(parent); - element = newView ? QQuickStackViewPrivate::get(newView)->findElement(item) : Q_NULLPTR; + element = newView ? QQuickStackViewPrivate::get(newView)->findElement(item) : nullptr; int newIndex = element ? element->index : -1; QQuickStackView::Status newStatus = element ? element->status : QQuickStackView::Inactive; @@ -950,7 +950,7 @@ int QQuickStackAttached::index() const QQuickStackView *QQuickStackAttached::view() const { Q_D(const QQuickStackAttached); - return d->element ? d->element->view : Q_NULLPTR; + return d->element ? d->element->view : nullptr; } /*! diff --git a/src/templates/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp index 77f1430f..5d967a0e 100644 --- a/src/templates/qquickstackview_p.cpp +++ b/src/templates/qquickstackview_p.cpp @@ -62,15 +62,15 @@ public: QQuickStackIncubator(QQuickStackElement *element) : QQmlIncubator(Synchronous), element(element) { } protected: - void setInitialState(QObject *object) Q_DECL_OVERRIDE { element->incubate(object); } + void setInitialState(QObject *object) override { element->incubate(object); } private: QQuickStackElement *element; }; -QQuickStackElement::QQuickStackElement() : QQuickItemViewTransitionableItem(Q_NULLPTR), +QQuickStackElement::QQuickStackElement() : QQuickItemViewTransitionableItem(nullptr), index(-1), init(false), removal(false), ownItem(false), ownComponent(false), widthValid(false), heightValid(false), - context(Q_NULLPTR), component(Q_NULLPTR), incubator(Q_NULLPTR), view(Q_NULLPTR), + context(nullptr), component(nullptr), incubator(nullptr), view(nullptr), status(QQuickStackView::Inactive) { } @@ -85,9 +85,9 @@ QQuickStackElement::~QQuickStackElement() if (item) { if (ownItem) { - item->setParentItem(Q_NULLPTR); + item->setParentItem(nullptr); item->deleteLater(); - item = Q_NULLPTR; + item = nullptr; } else { item->setVisible(false); if (item->parentItem() != originalParent) { @@ -95,7 +95,7 @@ QQuickStackElement::~QQuickStackElement() } else { QQuickStackAttached *attached = attachedStackObject(this); if (attached) - QQuickStackAttachedPrivate::get(attached)->itemParentChanged(item, Q_NULLPTR); + QQuickStackAttachedPrivate::get(attached)->itemParentChanged(item, nullptr); } } } @@ -241,10 +241,10 @@ void QQuickStackElement::startTransition(QQuickItemViewTransitioner *transitione void QQuickStackElement::itemDestroyed(QQuickItem *) { - item = Q_NULLPTR; + item = nullptr; } -QQuickStackViewPrivate::QQuickStackViewPrivate() : busy(false), currentItem(Q_NULLPTR), transitioner(Q_NULLPTR) +QQuickStackViewPrivate::QQuickStackViewPrivate() : busy(false), currentItem(nullptr), transitioner(nullptr) { } @@ -314,19 +314,19 @@ QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(QQmlV4Function QQuickStackElement *QQuickStackViewPrivate::findElement(QQuickItem *item) const { if (item) { - foreach (QQuickStackElement *e, elements) { + for (QQuickStackElement *e : qAsConst(elements)) { if (e->item == item) return e; } } - return Q_NULLPTR; + return nullptr; } QQuickStackElement *QQuickStackViewPrivate::findElement(const QV4::Value &value) const { if (const QV4::QObjectWrapper *o = value.as<QV4::QObjectWrapper>()) return findElement(qobject_cast<QQuickItem *>(o->object())); - return Q_NULLPTR; + return nullptr; } QQuickStackElement *QQuickStackViewPrivate::createElement(const QV4::Value &value) @@ -336,14 +336,14 @@ QQuickStackElement *QQuickStackViewPrivate::createElement(const QV4::Value &valu return QQuickStackElement::fromString(s->toQString(), q); if (const QV4::QObjectWrapper *o = value.as<QV4::QObjectWrapper>()) return QQuickStackElement::fromObject(o->object(), q); - return Q_NULLPTR; + return nullptr; } bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &elems) { Q_Q(QQuickStackView); if (!elems.isEmpty()) { - foreach (QQuickStackElement *e, elems) { + for (QQuickStackElement *e : elems) { e->setIndex(elements.count()); elements += e; } diff --git a/src/templates/qquickstackview_p.h b/src/templates/qquickstackview_p.h index 6b78b50a..34a430e7 100644 --- a/src/templates/qquickstackview_p.h +++ b/src/templates/qquickstackview_p.h @@ -73,7 +73,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickStackView : public QQuickControl Q_PROPERTY(QQuickTransition *replaceExit READ replaceExit WRITE setReplaceExit NOTIFY replaceExitChanged FINAL) public: - explicit QQuickStackView(QQuickItem *parent = Q_NULLPTR); + explicit QQuickStackView(QQuickItem *parent = nullptr); ~QQuickStackView(); static QQuickStackAttached *qmlAttachedProperties(QObject *object); @@ -145,9 +145,9 @@ Q_SIGNALS: void replaceExitChanged(); protected: - void componentComplete() Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - bool childMouseEventFilter(QQuickItem *, QEvent *) Q_DECL_OVERRIDE; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + bool childMouseEventFilter(QQuickItem *, QEvent *) override; private: Q_DISABLE_COPY(QQuickStackView) @@ -164,7 +164,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickStackAttached : public QObject Q_PROPERTY(QQuickStackView::Status status READ status NOTIFY statusChanged FINAL) public: - explicit QQuickStackAttached(QQuickItem *parent = Q_NULLPTR); + explicit QQuickStackAttached(QQuickItem *parent = nullptr); ~QQuickStackAttached(); int index() const; diff --git a/src/templates/qquickstackview_p_p.h b/src/templates/qquickstackview_p_p.h index d14c6326..93d08034 100644 --- a/src/templates/qquickstackview_p_p.h +++ b/src/templates/qquickstackview_p_p.h @@ -82,7 +82,7 @@ public: bool prepareTransition(QQuickItemViewTransitioner *transitioner, const QRectF &viewBounds); void startTransition(QQuickItemViewTransitioner *transitioner); - void itemDestroyed(QQuickItem *item) Q_DECL_OVERRIDE; + void itemDestroyed(QQuickItem *item) override; int index; bool init; @@ -129,7 +129,7 @@ public: void replaceTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate); void completeTransition(QQuickStackElement *element, QQuickTransition *transition); - void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) Q_DECL_OVERRIDE; + void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) override; void setBusy(bool busy); bool busy; @@ -145,7 +145,7 @@ class QQuickStackAttachedPrivate : public QObjectPrivate, public QQuickItemChang Q_DECLARE_PUBLIC(QQuickStackAttached) public: - QQuickStackAttachedPrivate() : element(Q_NULLPTR) { } + QQuickStackAttachedPrivate() : element(nullptr) { } static QQuickStackAttachedPrivate *get(QQuickStackAttached *attached) { diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp index f78d0120..b73a8ac0 100644 --- a/src/templates/qquickswipeview.cpp +++ b/src/templates/qquickswipeview.cpp @@ -111,7 +111,7 @@ QQuickSwipeViewAttached *QQuickSwipeView::qmlAttachedProperties(QObject *object) QQuickItem *item = qobject_cast<QQuickItem *>(object); if (!item) { qWarning() << "SwipeView: attached properties must be accessed from within a child item"; - return Q_NULLPTR; + return nullptr; } return new QQuickSwipeViewAttached(item); @@ -161,7 +161,7 @@ class QQuickSwipeViewAttachedPrivate : public QObjectPrivate, public QQuickItemC public: QQuickSwipeViewAttachedPrivate(QQuickItem *item) : item(item), - swipeView(Q_NULLPTR), + swipeView(nullptr), index(-1), isCurrent(false) { @@ -172,9 +172,9 @@ public: void updateView(QQuickItem *parent); - void itemChildAdded(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; - void itemChildRemoved(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; - void itemParentChanged(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; + void itemChildAdded(QQuickItem *, QQuickItem *) override; + void itemChildRemoved(QQuickItem *, QQuickItem *) override; + void itemParentChanged(QQuickItem *, QQuickItem *) override; void updateIndex(); void updateIsCurrent(); @@ -194,7 +194,7 @@ public: void QQuickSwipeViewAttachedPrivate::updateIndex() { - setIndex(swipeView ? QQuickSwipeViewPrivate::get(swipeView)->contentModel->indexOf(item, Q_NULLPTR) : -1); + setIndex(swipeView ? QQuickSwipeViewPrivate::get(swipeView)->contentModel->indexOf(item, nullptr) : -1); } void QQuickSwipeViewAttachedPrivate::updateIsCurrent() @@ -261,7 +261,7 @@ void QQuickSwipeViewAttachedPrivate::updateView(QQuickItem *parent) // - A non-visual or weird type like TestCase, when child items are created from components // wherein the attached properties are used // - null, when the item was removed with removeItem() - QQuickSwipeView *view = Q_NULLPTR; + QQuickSwipeView *view = nullptr; if (parent) { view = qobject_cast<QQuickSwipeView*>(parent); if (!view) { diff --git a/src/templates/qquickswipeview_p.h b/src/templates/qquickswipeview_p.h index bf733c7b..7a649300 100644 --- a/src/templates/qquickswipeview_p.h +++ b/src/templates/qquickswipeview_p.h @@ -60,13 +60,13 @@ class Q_LABSTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer Q_OBJECT public: - explicit QQuickSwipeView(QQuickItem *parent = Q_NULLPTR); + explicit QQuickSwipeView(QQuickItem *parent = nullptr); static QQuickSwipeViewAttached *qmlAttachedProperties(QObject *object); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void itemAdded(int index, QQuickItem *item) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void itemAdded(int index, QQuickItem *item) override; private: Q_DISABLE_COPY(QQuickSwipeView) diff --git a/src/templates/qquickswitch_p.h b/src/templates/qquickswitch_p.h index 94d0d601..ee8f49f8 100644 --- a/src/templates/qquickswitch_p.h +++ b/src/templates/qquickswitch_p.h @@ -61,7 +61,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickSwitch : public QQuickAbstractButton Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL) public: - explicit QQuickSwitch(QQuickItem *parent = Q_NULLPTR); + explicit QQuickSwitch(QQuickItem *parent = nullptr); qreal position() const; void setPosition(qreal position); @@ -73,8 +73,8 @@ Q_SIGNALS: void visualPositionChanged(); protected: - void mirrorChange() Q_DECL_OVERRIDE; - bool childMouseEventFilter(QQuickItem *child, QEvent *event) Q_DECL_OVERRIDE; + void mirrorChange() override; + bool childMouseEventFilter(QQuickItem *child, QEvent *event) override; virtual qreal positionAt(const QPoint &point) const; diff --git a/src/templates/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp index 58d68058..5b6ac890 100644 --- a/src/templates/qquicktabbar.cpp +++ b/src/templates/qquicktabbar.cpp @@ -69,11 +69,19 @@ class QQuickTabBarPrivate : public QQuickContainerPrivate Q_DECLARE_PUBLIC(QQuickTabBar) public: + QQuickTabBarPrivate(); + void updateCurrentItem(); void updateCurrentIndex(); void updateLayout(); + + QQuickTabBar::Position position; }; +QQuickTabBarPrivate::QQuickTabBarPrivate() : position(QQuickTabBar::Header) +{ +} + void QQuickTabBarPrivate::updateCurrentItem() { QQuickTabButton *button = qobject_cast<QQuickTabButton *>(contentModel->get(currentIndex)); @@ -86,7 +94,7 @@ void QQuickTabBarPrivate::updateCurrentIndex() Q_Q(QQuickTabBar); QQuickTabButton *button = qobject_cast<QQuickTabButton *>(q->sender()); if (button && button->isChecked()) - q->setCurrentIndex(contentModel->indexOf(button, Q_NULLPTR)); + q->setCurrentIndex(contentModel->indexOf(button, nullptr)); } void QQuickTabBarPrivate::updateLayout() @@ -117,6 +125,38 @@ QQuickTabBar::QQuickTabBar(QQuickItem *parent) : QObjectPrivate::connect(this, &QQuickTabBar::currentIndexChanged, d, &QQuickTabBarPrivate::updateCurrentItem); } +/*! + \qmlproperty enumeration Qt.labs.controls::TabBar::position + + This property holds the position of the tab bar. + + \note If the tab bar is assigned as a header or footer of ApplicationWindow + or Page, the appropriate position is set automatically. + + Possible values: + \value TabBar.Header The tab bar is at the top, as a window or page header. + \value TabBar.Footer The tab bar is at the bottom, as a window or page footer. + + The default value is style-specific. + + \sa ApplicationWindow::header, ApplicationWindow::footer, Page::header, Page::footer +*/ +QQuickTabBar::Position QQuickTabBar::position() const +{ + Q_D(const QQuickTabBar); + return d->position; +} + +void QQuickTabBar::setPosition(Position position) +{ + Q_D(QQuickTabBar); + if (d->position == position) + return; + + d->position = position; + emit positionChanged(); +} + void QQuickTabBar::updatePolish() { Q_D(QQuickTabBar); diff --git a/src/templates/qquicktabbar_p.h b/src/templates/qquicktabbar_p.h index 7d6f674c..abfd4dc9 100644 --- a/src/templates/qquicktabbar_p.h +++ b/src/templates/qquicktabbar_p.h @@ -57,20 +57,33 @@ class QQuickTabBarPrivate; class Q_LABSTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer { Q_OBJECT + Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL) public: - explicit QQuickTabBar(QQuickItem *parent = Q_NULLPTR); + explicit QQuickTabBar(QQuickItem *parent = nullptr); + + enum Position { + Header, + Footer + }; + Q_ENUM(Position) + + Position position() const; + void setPosition(Position position); + +Q_SIGNALS: + void positionChanged(); protected: - void updatePolish() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - bool isContent(QQuickItem *item) const Q_DECL_OVERRIDE; - void itemAdded(int index, QQuickItem *item) Q_DECL_OVERRIDE; - void itemRemoved(int index, QQuickItem *item) Q_DECL_OVERRIDE; + void updatePolish() override; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + bool isContent(QQuickItem *item) const override; + void itemAdded(int index, QQuickItem *item) override; + void itemRemoved(int index, QQuickItem *item) override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: diff --git a/src/templates/qquicktabbutton_p.h b/src/templates/qquicktabbutton_p.h index c02a206f..07a020e5 100644 --- a/src/templates/qquicktabbutton_p.h +++ b/src/templates/qquicktabbutton_p.h @@ -57,13 +57,13 @@ class Q_LABSTEMPLATES_EXPORT QQuickTabButton : public QQuickAbstractButton Q_OBJECT public: - explicit QQuickTabButton(QQuickItem *parent = Q_NULLPTR); + explicit QQuickTabButton(QQuickItem *parent = nullptr); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif }; diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index 05b1b9a7..e83f8bf1 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE */ QQuickTextAreaPrivate::QQuickTextAreaPrivate() - : background(Q_NULLPTR), focusReason(Qt::OtherFocusReason), accessibleAttached(Q_NULLPTR) + : background(nullptr), focusReason(Qt::OtherFocusReason), accessibleAttached(nullptr) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); diff --git a/src/templates/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h index acf67359..623dc952 100644 --- a/src/templates/qquicktextarea_p.h +++ b/src/templates/qquicktextarea_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) public: - explicit QQuickTextArea(QQuickItem *parent = Q_NULLPTR); + explicit QQuickTextArea(QQuickItem *parent = nullptr); ~QQuickTextArea(); QFont font() const; @@ -93,18 +93,18 @@ Q_SIGNALS: void pressAndHold(QQuickMouseEvent *event); protected: - void classBegin() Q_DECL_OVERRIDE; - - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE; - - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void classBegin() override; + + void itemChange(ItemChange change, const ItemChangeData &value) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override; + + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void timerEvent(QTimerEvent *event) override; private: Q_DISABLE_COPY(QQuickTextArea) diff --git a/src/templates/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h index 2a16e5cc..35dd704d 100644 --- a/src/templates/qquicktextarea_p_p.h +++ b/src/templates/qquicktextarea_p_p.h @@ -78,17 +78,17 @@ public: void resizeBackground(); void resolveFont(); - qreal getImplicitWidth() const Q_DECL_OVERRIDE; - qreal getImplicitHeight() const Q_DECL_OVERRIDE; + qreal getImplicitWidth() const override; + qreal getImplicitHeight() const override; - void implicitWidthChanged() Q_DECL_OVERRIDE; - void implicitHeightChanged() Q_DECL_OVERRIDE; + void implicitWidthChanged() override; + void implicitHeightChanged() override; void _q_readOnlyChanged(bool isReadOnly); #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif QQuickItem *background; diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp index c3070614..782ff148 100644 --- a/src/templates/qquicktextfield.cpp +++ b/src/templates/qquicktextfield.cpp @@ -91,9 +91,9 @@ QT_BEGIN_NAMESPACE */ QQuickTextFieldPrivate::QQuickTextFieldPrivate() - : background(Q_NULLPTR) + : background(nullptr) , focusReason(Qt::OtherFocusReason) - , accessibleAttached(Q_NULLPTR) + , accessibleAttached(nullptr) { #ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); diff --git a/src/templates/qquicktextfield_p.h b/src/templates/qquicktextfield_p.h index 23658cc6..ee5f3470 100644 --- a/src/templates/qquicktextfield_p.h +++ b/src/templates/qquicktextfield_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) public: - explicit QQuickTextField(QQuickItem *parent = Q_NULLPTR); + explicit QQuickTextField(QQuickItem *parent = nullptr); ~QQuickTextField(); QFont font() const; @@ -93,18 +93,18 @@ Q_SIGNALS: void pressAndHold(QQuickMouseEvent *mouse); protected: - void classBegin() Q_DECL_OVERRIDE; - - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE; - - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void classBegin() override; + + void itemChange(ItemChange change, const ItemChangeData &value) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override; + + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void timerEvent(QTimerEvent *event) override; private: Q_DISABLE_COPY(QQuickTextField) diff --git a/src/templates/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h index 29b01f15..3f799a5f 100644 --- a/src/templates/qquicktextfield_p_p.h +++ b/src/templates/qquicktextfield_p_p.h @@ -78,18 +78,18 @@ public: void resizeBackground(); void resolveFont(); - qreal getImplicitWidth() const Q_DECL_OVERRIDE; - qreal getImplicitHeight() const Q_DECL_OVERRIDE; + qreal getImplicitWidth() const override; + qreal getImplicitHeight() const override; - void implicitWidthChanged() Q_DECL_OVERRIDE; - void implicitHeightChanged() Q_DECL_OVERRIDE; + void implicitWidthChanged() override; + void implicitHeightChanged() override; void _q_readOnlyChanged(bool isReadOnly); void _q_echoModeChanged(QQuickTextField::EchoMode echoMode); #ifndef QT_NO_ACCESSIBILITY - void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + void accessibilityActiveChanged(bool active) override; + QAccessible::Role accessibleRole() const override; #endif QQuickItem *background; diff --git a/src/templates/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp index 882834e3..d093b431 100644 --- a/src/templates/qquicktoolbar.cpp +++ b/src/templates/qquicktoolbar.cpp @@ -35,6 +35,7 @@ ****************************************************************************/ #include "qquicktoolbar_p.h" +#include "qquickframe_p_p.h" QT_BEGIN_NAMESPACE @@ -91,11 +92,51 @@ QT_BEGIN_NAMESPACE \sa ApplicationWindow, ToolButton, {Customizing ToolBar}, {Container Controls} */ +class QQuickToolBarPrivate : public QQuickFramePrivate +{ +public: + QQuickToolBarPrivate() : position(QQuickToolBar::Header) { } + + QQuickToolBar::Position position; +}; + QQuickToolBar::QQuickToolBar(QQuickItem *parent) : - QQuickFrame(parent) + QQuickFrame(*(new QQuickToolBarPrivate), parent) { } +/*! + \qmlproperty enumeration Qt.labs.controls::ToolBar::position + + This property holds the position of the toolbar. + + \note If the toolbar is assigned as a header or footer of ApplicationWindow + or Page, the appropriate position is set automatically. + + Possible values: + \value ToolBar.Header The toolbar is at the top, as a window or page header. + \value ToolBar.Footer The toolbar is at the bottom, as a window or page footer. + + The default value is style-specific. + + \sa ApplicationWindow::header, ApplicationWindow::footer, Page::header, Page::footer +*/ +QQuickToolBar::Position QQuickToolBar::position() const +{ + Q_D(const QQuickToolBar); + return d->position; +} + +void QQuickToolBar::setPosition(Position position) +{ + Q_D(QQuickToolBar); + if (d->position == position) + return; + + d->position = position; + emit positionChanged(); +} + #ifndef QT_NO_ACCESSIBILITY QAccessible::Role QQuickToolBar::accessibleRole() const { diff --git a/src/templates/qquicktoolbar_p.h b/src/templates/qquicktoolbar_p.h index 501f74c7..f6625847 100644 --- a/src/templates/qquicktoolbar_p.h +++ b/src/templates/qquicktoolbar_p.h @@ -52,17 +52,36 @@ QT_BEGIN_NAMESPACE +class QQuickToolBarPrivate; + class Q_LABSTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame { Q_OBJECT + Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL) public: - explicit QQuickToolBar(QQuickItem *parent = Q_NULLPTR); + explicit QQuickToolBar(QQuickItem *parent = nullptr); + + enum Position { + Header, + Footer + }; + Q_ENUM(Position) + + Position position() const; + void setPosition(Position position); + +Q_SIGNALS: + void positionChanged(); protected: #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif + +private: + Q_DISABLE_COPY(QQuickToolBar) + Q_DECLARE_PRIVATE(QQuickToolBar) }; QT_END_NAMESPACE diff --git a/src/templates/qquicktoolbutton_p.h b/src/templates/qquicktoolbutton_p.h index 25f2134d..a4b4d227 100644 --- a/src/templates/qquicktoolbutton_p.h +++ b/src/templates/qquicktoolbutton_p.h @@ -57,10 +57,10 @@ class Q_LABSTEMPLATES_EXPORT QQuickToolButton : public QQuickButton Q_OBJECT public: - explicit QQuickToolButton(QQuickItem *parent = Q_NULLPTR); + explicit QQuickToolButton(QQuickItem *parent = nullptr); protected: - QFont defaultFont() const Q_DECL_OVERRIDE; + QFont defaultFont() const override; }; QT_END_NAMESPACE diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index 3818910a..fcc443df 100644 --- a/src/templates/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp @@ -77,7 +77,7 @@ class QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChang public: QQuickTumblerPrivate() : - delegate(Q_NULLPTR), + delegate(nullptr), visibleItemCount(3) { } @@ -93,8 +93,8 @@ public: void _q_updateItemHeights(); void _q_updateItemWidths(); - void itemChildAdded(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; - void itemChildRemoved(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; + void itemChildAdded(QQuickItem *, QQuickItem *) override; + void itemChildRemoved(QQuickItem *, QQuickItem *) override; }; static QList<QQuickItem *> contentItemChildItems(QQuickItem *contentItem) @@ -126,7 +126,7 @@ namespace { else if (contentType == ListViewContentItem) return qobject_cast<QQuickFlickable*>(rootContentItem)->contentItem(); - return Q_NULLPTR; + return nullptr; } static inline ContentItemType contentItemType(QQuickItem *rootContentItem) @@ -158,7 +158,8 @@ void QQuickTumblerPrivate::_q_updateItemHeights() // which doesn't affect them, only their getters. Q_Q(const QQuickTumbler); const qreal itemHeight = delegateHeight(q); - foreach (QQuickItem *childItem, contentItemChildItems(contentItem)) + const auto items = contentItemChildItems(contentItem); + for (QQuickItem *childItem : items) childItem->setHeight(itemHeight); } @@ -166,7 +167,8 @@ void QQuickTumblerPrivate::_q_updateItemWidths() { Q_Q(const QQuickTumbler); const qreal availableWidth = q->availableWidth(); - foreach (QQuickItem *childItem, contentItemChildItems(contentItem)) + const auto items = contentItemChildItems(contentItem); + for (QQuickItem *childItem : items) childItem->setWidth(availableWidth); } @@ -253,7 +255,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex) QQuickItem *QQuickTumbler::currentItem() const { Q_D(const QQuickTumbler); - return d->contentItem ? d->contentItem->property("currentItem").value<QQuickItem*>() : Q_NULLPTR; + return d->contentItem ? d->contentItem->property("currentItem").value<QQuickItem*>() : nullptr; } /*! @@ -303,7 +305,7 @@ QQuickTumblerAttached *QQuickTumbler::qmlAttachedProperties(QObject *object) QQuickItem *delegateItem = qobject_cast<QQuickItem *>(object); if (!delegateItem) { qWarning() << "Tumbler: attached properties of Tumbler must be accessed from within a delegate item"; - return Q_NULLPTR; + return nullptr; } return new QQuickTumblerAttached(delegateItem); @@ -396,7 +398,7 @@ class QQuickTumblerAttachedPrivate : public QObjectPrivate, public QQuickItemCha Q_DECLARE_PUBLIC(QQuickTumblerAttached) public: QQuickTumblerAttachedPrivate(QQuickItem *delegateItem) : - tumbler(Q_NULLPTR), + tumbler(nullptr), index(-1), displacement(1) { @@ -425,9 +427,9 @@ public: ~QQuickTumblerAttachedPrivate() { } - void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void itemChildAdded(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; - void itemChildRemoved(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override; + void itemChildAdded(QQuickItem *, QQuickItem *) override; + void itemChildRemoved(QQuickItem *, QQuickItem *) override; void _q_calculateDisplacement(); diff --git a/src/templates/qquicktumbler_p.h b/src/templates/qquicktumbler_p.h index ad57acbb..6c329496 100644 --- a/src/templates/qquicktumbler_p.h +++ b/src/templates/qquicktumbler_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickTumbler : public QQuickControl Q_PROPERTY(int visibleItemCount READ visibleItemCount WRITE setVisibleItemCount NOTIFY visibleItemCountChanged FINAL) public: - explicit QQuickTumbler(QQuickItem *parent = Q_NULLPTR); + explicit QQuickTumbler(QQuickItem *parent = nullptr); ~QQuickTumbler(); QVariant model() const; @@ -97,10 +97,10 @@ Q_SIGNALS: void visibleItemCountChanged(); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void componentComplete() override; + void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; + void keyPressEvent(QKeyEvent *event) override; private: Q_DISABLE_COPY(QQuickTumbler) diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index 34493ea0..4b392e99 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -420,7 +420,7 @@ void tst_applicationwindow::attachedProperties() QCOMPARE(childItem->property("attached_footer").value<QQuickItem *>(), childAppWindow->footer()); QCOMPARE(childItem->property("attached_overlay").value<QQuickItem *>(), childAppWindow->overlay()); - childControl->setParentItem(Q_NULLPTR); + childControl->setParentItem(nullptr); QVERIFY(!childControl->window()); QVERIFY(!childControl->property("attached_window").value<QQuickApplicationWindow *>()); QVERIFY(!childControl->property("attached_contentItem").value<QQuickItem *>()); @@ -429,7 +429,7 @@ void tst_applicationwindow::attachedProperties() QVERIFY(!childControl->property("attached_footer").value<QQuickItem *>()); QVERIFY(!childControl->property("attached_overlay").value<QQuickItem *>()); - childItem->setParentItem(Q_NULLPTR); + childItem->setParentItem(nullptr); QVERIFY(!childItem->window()); QVERIFY(!childItem->property("attached_window").value<QQuickApplicationWindow *>()); QVERIFY(!childItem->property("attached_contentItem").value<QQuickItem *>()); @@ -502,7 +502,7 @@ public: { QGuiApplicationPrivate::platform_theme = this; } ~TestTheme() { QGuiApplicationPrivate::platform_theme = theme(); } - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE + const QFont *font(Font type = SystemFont) const override { Q_UNUSED(type); return &m_font; diff --git a/tests/auto/pressandhold/data/dependencies.qml b/tests/auto/pressandhold/data/dependencies.qml new file mode 100644 index 00000000..13690bbc --- /dev/null +++ b/tests/auto/pressandhold/data/dependencies.qml @@ -0,0 +1,4 @@ +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Control { } diff --git a/tests/auto/sanity/data/dependencies.qml b/tests/auto/sanity/data/dependencies.qml new file mode 100644 index 00000000..13690bbc --- /dev/null +++ b/tests/auto/sanity/data/dependencies.qml @@ -0,0 +1,4 @@ +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Control { } diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index bc114d62..7f438721 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -267,14 +267,18 @@ static void addTestRows(QQmlEngine *engine, const QString &targetPath, const QSt // the engine's import path. This way we can use QQmlComponent to load each QML file // for benchmarking. - QFileInfoList entries = QDir(QQC2_IMPORT_PATH + targetPath).entryInfoList(QStringList("*.qml"), QDir::Files); + QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + targetPath).entryInfoList(QStringList("*.qml"), QDir::Files); foreach (const QFileInfo &entry, entries) { QString name = entry.baseName(); if (!skiplist.contains(name)) { foreach (const QString &importPath, engine->importPathList()) { - QString filePath = QDir(importPath + "/Qt/labs/" + targetPath).absoluteFilePath(entry.fileName()); + QString name = entry.dir().dirName() + "/" + entry.fileName(); + QString filePath = importPath + "/Qt/labs/" + targetPath + "/" + entry.fileName(); if (QFile::exists(filePath)) { - QTest::newRow(qPrintable(entry.dir().dirName() + "/" + entry.fileName())) << QUrl::fromLocalFile(filePath); + QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); + break; + } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); break; } } @@ -305,10 +309,10 @@ void tst_Sanity::attachedObjects() void tst_Sanity::attachedObjects_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/calendar"); - addTestRows(&engine, "/controls"); - addTestRows(&engine, "/controls/material", QStringList() << "Ripple" << "SliderHandle"); - addTestRows(&engine, "/controls/universal"); + addTestRows(&engine, "calendar"); + addTestRows(&engine, "controls"); + addTestRows(&engine, "controls/material", QStringList() << "Ripple" << "SliderHandle"); + addTestRows(&engine, "controls/universal"); } QTEST_MAIN(tst_Sanity) diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/snippets/data/dependencies.qml new file mode 100644 index 00000000..15fa1a9a --- /dev/null +++ b/tests/auto/snippets/data/dependencies.qml @@ -0,0 +1,6 @@ +import QtQuick 2.6 +import QtQuick.Layouts 1.3 +import Qt.labs.controls 1.0 +import Qt.labs.calendar 1.0 + +Control { } diff --git a/tests/auto/styles/data/dependencies.qml b/tests/auto/styles/data/dependencies.qml new file mode 100644 index 00000000..310fbf40 --- /dev/null +++ b/tests/auto/styles/data/dependencies.qml @@ -0,0 +1,7 @@ +import QtTest 1.0 +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.controls.material 1.0 +import Qt.labs.controls.universal 1.0 + +Control { } diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/creationtime/data/dependencies.qml new file mode 100644 index 00000000..65fb0414 --- /dev/null +++ b/tests/benchmarks/creationtime/data/dependencies.qml @@ -0,0 +1,7 @@ +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.controls.material 1.0 +import Qt.labs.controls.universal 1.0 +import Qt.labs.calendar 1.0 + +Control { } diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 2a61b0ea..927dd17d 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -78,15 +78,19 @@ static void addTestRows(QQmlEngine *engine, const QString &targetPath, const QSt // the engine's import path. This way we can use QQmlComponent to load each QML file // for benchmarking. - QFileInfoList entries = QDir(QQC2_IMPORT_PATH + targetPath).entryInfoList(QStringList("*.qml"), QDir::Files); + QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + targetPath).entryInfoList(QStringList("*.qml"), QDir::Files); foreach (const QFileInfo &entry, entries) { QString name = entry.baseName(); if (!skiplist.contains(name)) { foreach (const QString &importPath, engine->importPathList()) { - QString filePath = QDir(importPath + "/Qt/labs/" + targetPath).absoluteFilePath(entry.fileName()); + QString name = entry.dir().dirName() + "/" + entry.fileName(); + QString filePath = importPath + "/Qt/labs/" + targetPath + "/" + entry.fileName(); if (QFile::exists(filePath)) { QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); break; + } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); + break; } } } @@ -117,7 +121,7 @@ void tst_CreationTime::controls() void tst_CreationTime::controls_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/controls"); + addTestRows(&engine, "controls"); } void tst_CreationTime::material() @@ -129,7 +133,7 @@ void tst_CreationTime::material() void tst_CreationTime::material_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/controls/material", QStringList() << "Ripple" << "SliderHandle"); + addTestRows(&engine, "controls/material", QStringList() << "Ripple" << "SliderHandle"); } void tst_CreationTime::universal() @@ -141,7 +145,7 @@ void tst_CreationTime::universal() void tst_CreationTime::universal_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/controls/universal"); + addTestRows(&engine, "controls/universal"); } void tst_CreationTime::calendar() @@ -153,7 +157,7 @@ void tst_CreationTime::calendar() void tst_CreationTime::calendar_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/calendar"); + addTestRows(&engine, "calendar"); } QTEST_MAIN(tst_CreationTime) diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml new file mode 100644 index 00000000..65fb0414 --- /dev/null +++ b/tests/benchmarks/objectcount/data/dependencies.qml @@ -0,0 +1,7 @@ +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.controls.material 1.0 +import Qt.labs.controls.universal 1.0 +import Qt.labs.calendar 1.0 + +Control { } diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index b479b0e2..51a968d0 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -84,7 +84,7 @@ void tst_ObjectCount::init() // warmup QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 1.3 as C1; import Qt.labs.controls 1.0 as C2; Row { C1.Button {} C2.Button {} }", QUrl()); + component.setData("import QtQuick 2.0; import Qt.labs.controls 1.0; Item { Button {} }", QUrl()); delete component.create(); } @@ -118,15 +118,19 @@ static void addTestRows(QQmlEngine *engine, const QString &targetPath, const QSt // the engine's import path. This way we can use QQmlComponent to load each QML file // for benchmarking. - QFileInfoList entries = QDir(QQC2_IMPORT_PATH + targetPath).entryInfoList(QStringList("*.qml"), QDir::Files); + QFileInfoList entries = QDir(QQC2_IMPORT_PATH "/" + targetPath).entryInfoList(QStringList("*.qml"), QDir::Files); foreach (const QFileInfo &entry, entries) { QString name = entry.baseName(); if (!skiplist.contains(name)) { foreach (const QString &importPath, engine->importPathList()) { - QString filePath = QDir(importPath + "/Qt/labs/" + targetPath).absoluteFilePath(entry.fileName()); + QString name = entry.dir().dirName() + "/" + entry.fileName(); + QString filePath = importPath + "/Qt/labs/" + targetPath + "/" + entry.fileName(); if (QFile::exists(filePath)) { QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); break; + } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); + break; } } } @@ -161,7 +165,7 @@ void tst_ObjectCount::calendar() void tst_ObjectCount::calendar_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/calendar"); + addTestRows(&engine, "calendar"); } void tst_ObjectCount::controls() @@ -173,7 +177,7 @@ void tst_ObjectCount::controls() void tst_ObjectCount::controls_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/controls"); + addTestRows(&engine, "controls"); } void tst_ObjectCount::material() @@ -185,7 +189,7 @@ void tst_ObjectCount::material() void tst_ObjectCount::material_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/controls/material", QStringList() << "Ripple" << "SliderHandle"); + addTestRows(&engine, "controls/material", QStringList() << "Ripple" << "SliderHandle"); } void tst_ObjectCount::universal() @@ -197,7 +201,7 @@ void tst_ObjectCount::universal() void tst_ObjectCount::universal_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "/controls/universal"); + addTestRows(&engine, "controls/universal"); } QTEST_MAIN(tst_ObjectCount) diff --git a/tests/manual/gifs/eventcapturer.cpp b/tests/manual/gifs/eventcapturer.cpp index 5b5905cd..83e1c76b 100644 --- a/tests/manual/gifs/eventcapturer.cpp +++ b/tests/manual/gifs/eventcapturer.cpp @@ -69,7 +69,7 @@ EventCapturer::EventCapturer(QObject *parent) : QObject(parent), - mEventSource(Q_NULLPTR), + mEventSource(nullptr), mStopCaptureKey(Qt::Key_Escape), mMoveEventTrimFlags(TrimNone), mDuration(0), diff --git a/tests/manual/gifs/eventcapturer.h b/tests/manual/gifs/eventcapturer.h index b1f2b4ff..7982d6e9 100644 --- a/tests/manual/gifs/eventcapturer.h +++ b/tests/manual/gifs/eventcapturer.h @@ -74,7 +74,7 @@ public: QVector<CapturedEvent> capturedEvents() const; protected: - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; private slots: void stopCapturing(); diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp index 3ba33552..8082b736 100644 --- a/tests/manual/gifs/gifrecorder.cpp +++ b/tests/manual/gifs/gifrecorder.cpp @@ -64,8 +64,8 @@ namespace { } GifRecorder::GifRecorder() : - QObject(Q_NULLPTR), - mWindow(Q_NULLPTR), + QObject(nullptr), + mWindow(nullptr), mHighQuality(false), mRecordingDuration(0), mRecordCursor(false), diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/viewinqwidget/main.cpp index ff949544..3611e071 100644 --- a/tests/manual/viewinqwidget/main.cpp +++ b/tests/manual/viewinqwidget/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) const QUrl gallerySource(QLatin1String("qrc:/gallery.qml")); QQmlApplicationEngine engine(gallerySource); - QObject *root = engine.rootObjects().value(0, Q_NULLPTR); + QObject *root = engine.rootObjects().value(0, nullptr); if (!root || !root->isWindowType()) { qWarning() << "Load error" << gallerySource; return 1; |