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/quicktemplates2/qquicktumbler.cpp | |
| 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/quicktemplates2/qquicktumbler.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktumbler.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index a40330a3..ee4f161a 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -87,27 +87,6 @@ QT_BEGIN_NAMESPACE \sa {Customizing Tumbler}, {Input Controls} */ -QQuickTumblerPrivate::QQuickTumblerPrivate() - : delegate(nullptr), - visibleItemCount(5), - wrap(true), - explicitWrap(false), - ignoreWrapChanges(false), - view(nullptr), - viewContentItem(nullptr), - viewContentItemType(UnsupportedContentItemType), - currentIndex(-1), - pendingCurrentIndex(-1), - ignoreCurrentIndexChanges(false), - count(0), - ignoreSignals(false) -{ -} - -QQuickTumblerPrivate::~QQuickTumblerPrivate() -{ -} - namespace { static inline qreal delegateHeight(const QQuickTumbler *tumbler) { @@ -839,13 +818,6 @@ QPalette QQuickTumbler::defaultPalette() const return QQuickTheme::themePalette(QQuickTheme::Tumbler); } -QQuickTumblerAttachedPrivate::QQuickTumblerAttachedPrivate() - : tumbler(nullptr), - index(-1), - displacement(0) -{ -} - void QQuickTumblerAttachedPrivate::init(QQuickItem *delegateItem) { if (!delegateItem->parentItem()) { |