diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 03:00:08 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-07 14:18:09 +0200 |
commit | de9c38dd61ce29f549e2b13871e981209a0fed9e (patch) | |
tree | 9c1824fc361d7039d297cbf9a56002cea52f8c23 /src/quickcontrols2 | |
parent | 3b5143bb67cdaaff6b0eabedff1034e4add7ec87 (diff) | |
parent | bf39c3ce5524d151532d89efef40ff1a8e25f4c0 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quicktemplates2/qquickabstractbutton_p_p.h
src/quicktemplates2/qquickcombobox.cpp
src/quicktemplates2/qquickcontainer.cpp
src/quicktemplates2/qquickcontrol.cpp
src/quicktemplates2/qquickcontrol_p_p.h
src/quicktemplates2/qquickdialog_p_p.h
src/quicktemplates2/qquickdialogbuttonbox.cpp
src/quicktemplates2/qquickdialogbuttonbox_p_p.h
src/quicktemplates2/qquickdrawer.cpp
src/quicktemplates2/qquickmenubar.cpp
src/quicktemplates2/qquickmenubar_p_p.h
src/quicktemplates2/qquickpage.cpp
src/quicktemplates2/qquickpage_p_p.h
src/quicktemplates2/qquickpane.cpp
src/quicktemplates2/qquickpane_p_p.h
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickscrollview.cpp
src/quicktemplates2/qquickslider.cpp
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipeview.cpp
src/quicktemplates2/qquicktabbar.cpp
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p_p.h
src/quicktemplates2/qquicktheme_p.h
Change-Id: I6e2b8fe99e51e3e26c87546aa66af045bc429ec4
Diffstat (limited to 'src/quickcontrols2')
-rw-r--r-- | src/quickcontrols2/qquickanimatednode.cpp | 7 | ||||
-rw-r--r-- | src/quickcontrols2/qquickanimatednode_p.h | 12 | ||||
-rw-r--r-- | src/quickcontrols2/qquickclippedtext.cpp | 8 | ||||
-rw-r--r-- | src/quickcontrols2/qquickclippedtext_p.h | 12 | ||||
-rw-r--r-- | src/quickcontrols2/qquickcolorimage.cpp | 2 | ||||
-rw-r--r-- | src/quickcontrols2/qquickcolorimage_p.h | 4 | ||||
-rw-r--r-- | src/quickcontrols2/qquickiconimage.cpp | 8 | ||||
-rw-r--r-- | src/quickcontrols2/qquickiconimage_p_p.h | 10 | ||||
-rw-r--r-- | src/quickcontrols2/qquickiconlabel.cpp | 14 | ||||
-rw-r--r-- | src/quickcontrols2/qquickiconlabel_p_p.h | 22 | ||||
-rw-r--r-- | src/quickcontrols2/qquickmnemoniclabel.cpp | 3 | ||||
-rw-r--r-- | src/quickcontrols2/qquickmnemoniclabel_p.h | 2 | ||||
-rw-r--r-- | src/quickcontrols2/qquickpaddedrectangle.cpp | 4 | ||||
-rw-r--r-- | src/quickcontrols2/qquickpaddedrectangle_p.h | 18 | ||||
-rw-r--r-- | src/quickcontrols2/qquicktumblerview.cpp | 7 | ||||
-rw-r--r-- | src/quickcontrols2/qquicktumblerview_p.h | 10 |
16 files changed, 49 insertions, 94 deletions
diff --git a/src/quickcontrols2/qquickanimatednode.cpp b/src/quickcontrols2/qquickanimatednode.cpp index 3a18c757..b4e665de 100644 --- a/src/quickcontrols2/qquickanimatednode.cpp +++ b/src/quickcontrols2/qquickanimatednode.cpp @@ -44,12 +44,7 @@ QT_BEGIN_NAMESPACE QQuickAnimatedNode::QQuickAnimatedNode(QQuickItem *target) - : m_running(false), - m_duration(0), - m_loopCount(1), - m_currentTime(0), - m_currentLoop(0), - m_window(target->window()) + : m_window(target->window()) { } diff --git a/src/quickcontrols2/qquickanimatednode_p.h b/src/quickcontrols2/qquickanimatednode_p.h index 2e355e9a..d42d9319 100644 --- a/src/quickcontrols2/qquickanimatednode_p.h +++ b/src/quickcontrols2/qquickanimatednode_p.h @@ -98,13 +98,13 @@ private Q_SLOTS: void update(); private: - bool m_running; - int m_duration; - int m_loopCount; - int m_currentTime; - int m_currentLoop; + bool m_running = false; + int m_duration = 0; + int m_loopCount = 1; + int m_currentTime = 0; + int m_currentLoop = 0; QElapsedTimer m_timer; - QQuickWindow *m_window; + QQuickWindow *m_window = nullptr; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquickclippedtext.cpp b/src/quickcontrols2/qquickclippedtext.cpp index 7f113592..862197f3 100644 --- a/src/quickcontrols2/qquickclippedtext.cpp +++ b/src/quickcontrols2/qquickclippedtext.cpp @@ -41,13 +41,7 @@ QT_BEGIN_NAMESPACE QQuickClippedText::QQuickClippedText(QQuickItem *parent) - : QQuickText(parent), - m_hasClipWidth(false), - m_hasClipHeight(false), - m_clipX(0), - m_clipY(0), - m_clipWidth(0), - m_clipHeight(0) + : QQuickText(parent) { } diff --git a/src/quickcontrols2/qquickclippedtext_p.h b/src/quickcontrols2/qquickclippedtext_p.h index 7521525f..486ac7c4 100644 --- a/src/quickcontrols2/qquickclippedtext_p.h +++ b/src/quickcontrols2/qquickclippedtext_p.h @@ -81,12 +81,12 @@ public: private: void markClipDirty(); - bool m_hasClipWidth; - bool m_hasClipHeight; - qreal m_clipX; - qreal m_clipY; - qreal m_clipWidth; - qreal m_clipHeight; + bool m_hasClipWidth = false; + bool m_hasClipHeight = false; + qreal m_clipX = 0; + qreal m_clipY = 0; + qreal m_clipWidth = 0; + qreal m_clipHeight = 0; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquickcolorimage.cpp b/src/quickcontrols2/qquickcolorimage.cpp index 9d24a156..3afcef7e 100644 --- a/src/quickcontrols2/qquickcolorimage.cpp +++ b/src/quickcontrols2/qquickcolorimage.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE QQuickColorImage::QQuickColorImage(QQuickItem *parent) - : QQuickImage(parent), m_color(Qt::transparent), m_defaultColor(Qt::transparent) + : QQuickImage(parent) { } diff --git a/src/quickcontrols2/qquickcolorimage_p.h b/src/quickcontrols2/qquickcolorimage_p.h index 873bc2db..8227d068 100644 --- a/src/quickcontrols2/qquickcolorimage_p.h +++ b/src/quickcontrols2/qquickcolorimage_p.h @@ -79,8 +79,8 @@ protected: void pixmapChange() override; private: - QColor m_color; - QColor m_defaultColor; + QColor m_color = Qt::transparent; + QColor m_defaultColor = Qt::transparent; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquickiconimage.cpp b/src/quickcontrols2/qquickiconimage.cpp index 885bc7f9..c8357647 100644 --- a/src/quickcontrols2/qquickiconimage.cpp +++ b/src/quickcontrols2/qquickiconimage.cpp @@ -42,14 +42,6 @@ QT_BEGIN_NAMESPACE -QQuickIconImagePrivate::QQuickIconImagePrivate() - : color(Qt::transparent), - updatingIcon(false), - isThemeIcon(false), - updatingFillMode(false) -{ -} - bool QQuickIconImagePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio) { if (isThemeIcon) { diff --git a/src/quickcontrols2/qquickiconimage_p_p.h b/src/quickcontrols2/qquickiconimage_p_p.h index 8e8012bf..0c755ff6 100644 --- a/src/quickcontrols2/qquickiconimage_p_p.h +++ b/src/quickcontrols2/qquickiconimage_p_p.h @@ -59,19 +59,17 @@ class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickIconImagePrivate : public QQuickImag Q_DECLARE_PUBLIC(QQuickIconImage) public: - QQuickIconImagePrivate(); - void updateIcon(); void updateFillMode(); qreal calculateDevicePixelRatio() const; bool updateDevicePixelRatio(qreal targetDevicePixelRatio) override; QUrl source; - QColor color; + QColor color = Qt::transparent; QThemeIconInfo icon; - bool updatingIcon; - bool isThemeIcon; - bool updatingFillMode; + bool updatingIcon = false; + bool isThemeIcon = false; + bool updatingFillMode = false; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquickiconlabel.cpp b/src/quickcontrols2/qquickiconlabel.cpp index 960d9905..6232b48c 100644 --- a/src/quickcontrols2/qquickiconlabel.cpp +++ b/src/quickcontrols2/qquickiconlabel.cpp @@ -57,20 +57,6 @@ static void completeComponent(QQuickItem *item) parserStatus->componentComplete(); } -QQuickIconLabelPrivate::QQuickIconLabelPrivate() - : mirrored(false), - display(QQuickIconLabel::TextBesideIcon), - alignment(Qt::AlignCenter), - spacing(0), - topPadding(0), - leftPadding(0), - rightPadding(0), - bottomPadding(0), - image(nullptr), - label(nullptr) -{ -} - bool QQuickIconLabelPrivate::hasIcon() const { return display != QQuickIconLabel::TextOnly && !icon.isEmpty(); diff --git a/src/quickcontrols2/qquickiconlabel_p_p.h b/src/quickcontrols2/qquickiconlabel_p_p.h index f0f4df4c..6a2a0f58 100644 --- a/src/quickcontrols2/qquickiconlabel_p_p.h +++ b/src/quickcontrols2/qquickiconlabel_p_p.h @@ -62,8 +62,6 @@ class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChange Q_DECLARE_PUBLIC(QQuickIconLabel) public: - explicit QQuickIconLabelPrivate(); - bool hasIcon() const; bool hasText() const; @@ -92,20 +90,20 @@ public: void itemImplicitHeightChanged(QQuickItem *) override; void itemDestroyed(QQuickItem *item) override; - bool mirrored; - QQuickIconLabel::Display display; - Qt::Alignment alignment; - qreal spacing; - qreal topPadding; - qreal leftPadding; - qreal rightPadding; - qreal bottomPadding; + bool mirrored = false; + QQuickIconLabel::Display display = QQuickIconLabel::TextBesideIcon; + Qt::Alignment alignment = Qt::AlignCenter; + qreal spacing = 0; + qreal topPadding = 0; + qreal leftPadding = 0; + qreal rightPadding = 0; + qreal bottomPadding = 0; QFont font; QColor color; QString text; QQuickIcon icon; - QQuickIconImage *image; - QQuickMnemonicLabel *label; + QQuickIconImage *image = nullptr; + QQuickMnemonicLabel *label = nullptr; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquickmnemoniclabel.cpp b/src/quickcontrols2/qquickmnemoniclabel.cpp index 9c8e9ab1..a006f076 100644 --- a/src/quickcontrols2/qquickmnemoniclabel.cpp +++ b/src/quickcontrols2/qquickmnemoniclabel.cpp @@ -41,8 +41,7 @@ QT_BEGIN_NAMESPACE QQuickMnemonicLabel::QQuickMnemonicLabel(QQuickItem *parent) - : QQuickText(parent), - m_mnemonicVisible(true) + : QQuickText(parent) { } diff --git a/src/quickcontrols2/qquickmnemoniclabel_p.h b/src/quickcontrols2/qquickmnemoniclabel_p.h index 33bc1e08..da5a83db 100644 --- a/src/quickcontrols2/qquickmnemoniclabel_p.h +++ b/src/quickcontrols2/qquickmnemoniclabel_p.h @@ -71,7 +71,7 @@ public: private: void updateMnemonic(); - bool m_mnemonicVisible; + bool m_mnemonicVisible = true; QString m_fullText; }; diff --git a/src/quickcontrols2/qquickpaddedrectangle.cpp b/src/quickcontrols2/qquickpaddedrectangle.cpp index f7088d54..fd9e9d90 100644 --- a/src/quickcontrols2/qquickpaddedrectangle.cpp +++ b/src/quickcontrols2/qquickpaddedrectangle.cpp @@ -41,9 +41,7 @@ QT_BEGIN_NAMESPACE QQuickPaddedRectangle::QQuickPaddedRectangle(QQuickItem *parent) : - QQuickRectangle(parent), m_padding(0), - m_topPadding(0), m_leftPadding(0), m_rightPadding(0), m_bottomPadding(0), - m_hasTopPadding(false), m_hasLeftPadding(false), m_hasRightPadding(false), m_hasBottomPadding(false) + QQuickRectangle(parent) { } diff --git a/src/quickcontrols2/qquickpaddedrectangle_p.h b/src/quickcontrols2/qquickpaddedrectangle_p.h index 261691ee..c2e0ddef 100644 --- a/src/quickcontrols2/qquickpaddedrectangle_p.h +++ b/src/quickcontrols2/qquickpaddedrectangle_p.h @@ -101,15 +101,15 @@ private: void setRightPadding(qreal padding, bool has); void setBottomPadding(qreal padding, bool has); - qreal m_padding; - qreal m_topPadding; - qreal m_leftPadding; - qreal m_rightPadding; - qreal m_bottomPadding; - bool m_hasTopPadding; - bool m_hasLeftPadding; - bool m_hasRightPadding; - bool m_hasBottomPadding; + qreal m_padding = 0; + qreal m_topPadding = 0; + qreal m_leftPadding = 0; + qreal m_rightPadding = 0; + qreal m_bottomPadding = 0; + bool m_hasTopPadding = false; + bool m_hasLeftPadding = false; + bool m_hasRightPadding = false; + bool m_hasBottomPadding = false; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquicktumblerview.cpp b/src/quickcontrols2/qquicktumblerview.cpp index 4469810c..59d05211 100644 --- a/src/quickcontrols2/qquicktumblerview.cpp +++ b/src/quickcontrols2/qquicktumblerview.cpp @@ -46,12 +46,7 @@ QT_BEGIN_NAMESPACE QQuickTumblerView::QQuickTumblerView(QQuickItem *parent) : - QQuickItem(parent), - m_tumbler(nullptr), - m_delegate(nullptr), - m_pathView(nullptr), - m_listView(nullptr), - m_path(nullptr) + QQuickItem(parent) { // We don't call createView() here because we don't know what the wrap flag is set to // yet, and we don't want to create a view that might never get used. diff --git a/src/quickcontrols2/qquicktumblerview_p.h b/src/quickcontrols2/qquicktumblerview_p.h index 0ab0c3a9..138af1b4 100644 --- a/src/quickcontrols2/qquicktumblerview_p.h +++ b/src/quickcontrols2/qquicktumblerview_p.h @@ -96,12 +96,12 @@ private: void wrapChange(); - QQuickTumbler *m_tumbler; + QQuickTumbler *m_tumbler = nullptr; QVariant m_model; - QQmlComponent *m_delegate; - QQuickPathView *m_pathView; - QQuickListView *m_listView; - QQuickPath *m_path; + QQmlComponent *m_delegate = nullptr; + QQuickPathView *m_pathView = nullptr; + QQuickListView *m_listView = nullptr; + QQuickPath *m_path = nullptr; }; QT_END_NAMESPACE |