diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-05-12 10:23:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-05-12 15:37:03 +0200 |
| commit | df63c4f1310830fbd7f97c07dabf1ff6e1982fb2 (patch) | |
| tree | ee738ceac168bed24375521e26925a4050eb24e0 | |
| parent | e0f2fe95a5c323825da79b5bed98745c437715ab (diff) | |
| parent | 70bd2661311e11ac0679160ad0bbb36bdb6c6ecf (diff) | |
Merge branch 'origin/stable' into dev
70bd266 resolves the current tst_controls failure which is blocking
qtdeclarative#dev integration. We cannot merge the latest origin/stable
yet, because that depends on the next qtdeclarative stable->dev merge.
Change-Id: I170aec576a06bc79e2df9564e8cf77a0044bd3aa
| -rw-r--r-- | src/controls/qquickpopupwindow.cpp | 1 | ||||
| -rw-r--r-- | tests/manual/keynavigation.qml | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index 27f4b34a1..a9e85ff30 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -53,7 +53,6 @@ QQuickPopupWindow::QQuickPopupWindow() : m_dismissed(false) { setFlags(Qt::Popup); - setModality(Qt::ApplicationModal); connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(applicationStateChanged(Qt::ApplicationState))); } diff --git a/tests/manual/keynavigation.qml b/tests/manual/keynavigation.qml index 66fd4875d..ac5509597 100644 --- a/tests/manual/keynavigation.qml +++ b/tests/manual/keynavigation.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 0.1 +import QtQuick.Controls 1.2 ApplicationWindow { width: 400 @@ -48,7 +48,7 @@ ApplicationWindow { Rectangle { id: back anchors.fill: parent - color: enabled ? "red" : "blue" + color: enabled ? "lightgray" : "wheat" } Column { @@ -109,11 +109,12 @@ ApplicationWindow { } } - ButtonRow { - exclusive: true + Row { + ExclusiveGroup { id: exclusive } RadioButton { id: radioButton1 text: "RadioButton 1" + exclusiveGroup: exclusive activeFocusOnPress: true KeyNavigation.tab: radioButton2 KeyNavigation.backtab: checkbox3 @@ -122,6 +123,7 @@ ApplicationWindow { RadioButton { id: radioButton2 text: "RadioButton 2" + exclusiveGroup: exclusive activeFocusOnPress: true KeyNavigation.tab: radioButton3 KeyNavigation.backtab: radioButton1 @@ -130,6 +132,7 @@ ApplicationWindow { RadioButton { id: radioButton3 text: "RadioButton 3" + exclusiveGroup: exclusive activeFocusOnPress: true KeyNavigation.backtab: radioButton2 onClicked: back.enabled = !back.enabled |