diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
| commit | ad964dd36a56dcd071bb3527ee4957c607365cce (patch) | |
| tree | 1e916348677fa8ca974916b9f3e3fcb3a55d3b48 /tests/auto | |
| parent | e42603fd5b4efaa321dfc4417905510beafe288e (diff) | |
| parent | 148faf6278186986d1ca6afcdea0c361bcbf199e (diff) | |
| download | qtquickcontrols-ad964dd36a56dcd071bb3527ee4957c607365cce.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/controls/qquickmenubar.cpp
Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 14 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_menu.qml | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index cecc3928..7db9a75e 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -774,5 +774,19 @@ TestCase { compare(comboBox.currentText, "Pomegranate") comboBox.destroy() } + + function test_qtBug44532() { + if (Qt.platform.os === "osx") + skip("When the menu pops up on OS X, it does not return and the test fails after time out") + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: ["A", "BB", "CCCCC"] }', container, '') + var popup = comboBox.__popup + verify(popup) + tryCompare(popup, "__popupVisible", false) + mouseClick(comboBox) + tryCompare(popup, "__popupVisible", true) + mouseClick(comboBox) + tryCompare(popup, "__popupVisible", false) + comboBox.destroy() + } } } diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index 83411bcf..94661ed4 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -236,7 +236,7 @@ TestCase { function test_popupSignals() { if (Qt.platform.os === "osx") { // On Mac the popup() function blocks. The signals are still - // emitted by the QPA plugin and the relayed by QQuickMenu. + // emitted by the QPA plugin and the relayed by QQuickMenu1. return; } menu.__popup(Qt.rect(50, 50, 20, 20)) |