diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-16 00:10:56 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-16 12:40:51 +0000 |
| commit | dca7048361d7bae21d5b5d6715c725f1b3d62d1e (patch) | |
| tree | e754035c26f65220207b3b576a2271f956d57b04 /tests/auto/controls/data/tst_menu.qml | |
| parent | add9875ec266351e7c2878a1e93da34181abab29 (diff) | |
| download | qtquickcontrols-dca7048361d7bae21d5b5d6715c725f1b3d62d1e.tar.gz | |
Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1
This avoids clashes between Qt Quick Controls and Qt Labs Controls.
Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01
Task-number: QTBUG-49794
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/controls/data/tst_menu.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_menu.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |