diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-11 20:25:01 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 20:25:01 +0000 |
commit | 8615db11a61178c5be5c2ef9e373ad0d245888d6 (patch) | |
tree | 04cd2ab41fdfd04cca1eac9f56d8aaaf5abbc23a | |
parent | b663020c9a60704dc53014522a3faa23892280a0 (diff) | |
parent | 41d9718bc4ac005b82d64db8a4312e7fef7548d9 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png | bin | 5283 -> 1795 bytes | |||
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png | bin | 5283 -> 1795 bytes | |||
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-universal-button.png | bin | 2172 -> 674 bytes | |||
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-universal-dark.png | bin | 5450 -> 2894 bytes | |||
-rw-r--r-- | src/templates/qquickbuttongroup.cpp | 2 | ||||
-rw-r--r-- | src/templates/qquickcombobox.cpp | 8 | ||||
-rw-r--r-- | src/templates/qquickscrollbar.cpp | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 25 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_scrollbar.qml | 20 |
9 files changed, 51 insertions, 8 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png Binary files differindex d45ae400..f612c243 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png +++ b/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png diff --git a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png Binary files differindex d45ae400..f612c243 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png +++ b/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png b/src/imports/controls/doc/images/qtquickcontrols-universal-button.png Binary files differindex 6ddec823..6c764ec9 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png +++ b/src/imports/controls/doc/images/qtquickcontrols-universal-button.png diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png b/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png Binary files differindex 98701550..ec459457 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png +++ b/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png diff --git a/src/templates/qquickbuttongroup.cpp b/src/templates/qquickbuttongroup.cpp index be8c4c32..7a087300 100644 --- a/src/templates/qquickbuttongroup.cpp +++ b/src/templates/qquickbuttongroup.cpp @@ -233,7 +233,7 @@ void QQuickButtonGroup::setCheckedButton(QQuickAbstractButton *checkedButton) } /*! - \qmlproperty list<Object> Qt.labs.controls::ButtonGroup::buttons + \qmlproperty list<AbstractButton> Qt.labs.controls::ButtonGroup::buttons \default This property holds the list of buttons. diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp index 8054dff8..d25e674c 100644 --- a/src/templates/qquickcombobox.cpp +++ b/src/templates/qquickcombobox.cpp @@ -165,7 +165,7 @@ public: void itemClicked(); - void initItem(int index, QObject *object); + void createdItem(int index, QObject *object); void countChanged(); void updateCurrentText(); void increase(); @@ -235,7 +235,7 @@ void QQuickComboBoxPrivate::itemClicked() } } -void QQuickComboBoxPrivate::initItem(int index, QObject *object) +void QQuickComboBoxPrivate::createdItem(int index, QObject *object) { QQuickAbstractButton *button = qobject_cast<QQuickAbstractButton *>(object); if (button) @@ -317,7 +317,7 @@ void QQuickComboBoxPrivate::createDelegateModel() if (oldModel) { disconnect(delegateModel, &QQmlInstanceModel::countChanged, this, &QQuickComboBoxPrivate::countChanged); disconnect(delegateModel, &QQmlInstanceModel::modelUpdated, this, &QQuickComboBoxPrivate::updateCurrentText); - disconnect(delegateModel, &QQmlInstanceModel::initItem, this, &QQuickComboBoxPrivate::initItem); + disconnect(delegateModel, &QQmlInstanceModel::createdItem, this, &QQuickComboBoxPrivate::createdItem); } ownModel = false; @@ -337,7 +337,7 @@ void QQuickComboBoxPrivate::createDelegateModel() if (delegateModel) { connect(delegateModel, &QQmlInstanceModel::countChanged, this, &QQuickComboBoxPrivate::countChanged); connect(delegateModel, &QQmlInstanceModel::modelUpdated, this, &QQuickComboBoxPrivate::updateCurrentText); - connect(delegateModel, &QQmlInstanceModel::initItem, this, &QQuickComboBoxPrivate::initItem); + connect(delegateModel, &QQmlInstanceModel::createdItem, this, &QQuickComboBoxPrivate::createdItem); } emit q->delegateModelChanged(); diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index e1e414c5..f8ce76ab 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -134,9 +134,9 @@ qreal QQuickScrollBarPrivate::positionAt(const QPoint &point) const { Q_Q(const QQuickScrollBar); if (orientation == Qt::Horizontal) - return point.x() / q->width(); + return (point.x() - q->leftPadding()) / q->availableWidth(); else - return point.y() / q->height(); + return (point.y() - q->topPadding()) / q->availableHeight(); } void QQuickScrollBarPrivate::resizeContent() diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index b2782b44..d51f16fb 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -769,4 +769,29 @@ TestCase { control.destroy() } + + Component { + id: asyncLoader + Loader { + active: false + asynchronous: true + sourceComponent: ComboBox { + model: ["First", "Second", "Third"] + } + } + } + + // QTBUG-51972 + function test_async() { + var loader = asyncLoader.createObject(testCase) + verify(loader) + + loader.active = true + tryCompare(loader, "status", Loader.Ready) + verify(loader.item) + compare(loader.item.currentText, "First") + compare(loader.item.displayText, "First") + + loader.destroy() + } } diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 9fa6496e..eed995bf 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -57,7 +57,7 @@ TestCase { Component { id: scrollBar - ScrollBar { } + ScrollBar { padding: 0 } } Component { @@ -248,4 +248,22 @@ TestCase { control.destroy() } + + function test_padding_data() { + return [ + { tag: "horizontal", properties: { visible: true, orientation: Qt.Horizontal, width: testCase.width, leftPadding: testCase.width * 0.1 } }, + { tag: "vertical", properties: { visible: true, orientation: Qt.Vertical, height: testCase.height, topPadding: testCase.height * 0.1 } } + ] + } + + function test_padding(data) { + var control = scrollBar.createObject(testCase, data.properties) + + mousePress(control, control.leftPadding + control.availableWidth * 0.5, control.topPadding + control.availableHeight * 0.5, Qt.LeftButton) + mouseRelease(control, control.leftPadding + control.availableWidth * 0.5, control.topPadding + control.availableHeight * 0.5, Qt.LeftButton) + + compare(control.position, 0.5) + + control.destroy() + } } |