Merge remote-tracking branch 'origin/release' into stable

Change-Id: I470ff77e4a52f37263c8f0d9bf789f10c643d659

8 files changed, 224 insertions, 4 deletions

diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index 3d3f8840..6e0160df 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -125,7 +125,12 @@ Window {
     default property alias data: contentArea.data
 
     color: syspal.window
-    flags: Qt.Window | Qt.WindowFullscreenButtonHint
+
+    flags: Qt.Window | Qt.WindowFullscreenButtonHint |
+        Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint |
+        Qt.WindowCloseButtonHint | Qt.WindowFullscreenButtonHint
+    // QTBUG-35049: Windows is removing features we didn't ask for, even though Qt::CustomizeWindowHint is not set
+    // Otherwise Qt.Window | Qt.WindowFullscreenButtonHint would be enough
 
     SystemPalette {id: syspal}
 
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index a14a22d1..566a46f8 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -112,7 +112,7 @@ public:
     }
 
     void initialize(QSGTexture *texture,
-                    const QRectF &bounds,
+                    const QRectF &bounds, qreal devicePixelRatio,
                     int left, int top, int right, int bottom) {
 
         delete m_material.texture();
@@ -127,6 +127,9 @@ public:
 
         QRectF tc = texture->normalizedTextureSubRect();
         QSize ts = texture->textureSize();
+        ts.setHeight(ts.height() / devicePixelRatio);
+        ts.setWidth(ts.width() / devicePixelRatio);
+
         qreal invtw = tc.width() / ts.width();
         qreal invth = tc.height() / ts.height();
 
@@ -1661,6 +1664,7 @@ QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
 
     styleNode->initialize(window()->createTextureFromImage(m_image, QQuickWindow::TextureCanUseAtlas),
                           boundingRect(),
+                          window()->devicePixelRatio(),
                           m_border.left(), m_border.top(), m_border.right(), m_border.bottom());
     return styleNode;
 }
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index bba4eae1..c756566d 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Private 1.0
 
@@ -164,6 +164,17 @@ Control {
     */
     readonly property alias hovered: mouseArea.containsMouse
 
+    /*!
+        \qmlsignal SpinBox::editingFinished()
+        \since 5.2
+
+        This signal is emitted when the Return or Enter key is pressed or
+        the control loses focus. Note that if there is a validator
+        set on the control and enter/return is pressed, this signal will
+        only be emitted if the validator returns an acceptable state.
+    */
+    signal editingFinished()
+
     style: Qt.createComponent(Settings.style + "/SpinBoxStyle.qml", spinbox)
 
     /*! \internal */
@@ -255,6 +266,8 @@ Control {
             selectValue()
         }
 
+        onEditingFinished: spinbox.editingFinished()
+
         color: __panel ? __panel.foregroundColor : "black"
         selectionColor: __panel ? __panel.selectionColor : "black"
         selectedTextColor: __panel ? __panel.selectedTextColor : "black"
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index c1e3ddab..0961430d 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Private 1.0
 
@@ -403,6 +403,18 @@ Control {
     signal accepted()
 
     /*!
+        \qmlsignal TextField::editingFinished()
+        \since 5.2
+
+        This signal is emitted when the Return or Enter key is pressed or
+        the text field loses focus. Note that if there is a validator or
+        inputMask set on the text field and enter/return is pressed, this
+        signal will only be emitted if the input follows
+        the inputMask and the validator returns an acceptable state.
+    */
+    signal editingFinished()
+
+    /*!
         \qmlmethod TextField::copy()
 
         Copies the currently selected text to the system clipboard.
@@ -591,5 +603,7 @@ Control {
             Qt.inputMethod.hide()
             textfield.accepted()
         }
+
+        onEditingFinished: textfield.editingFinished()
     }
 }
diff --git a/tests/auto/controls/data/spinbox/sp_editingfinished.qml b/tests/auto/controls/data/spinbox/sp_editingfinished.qml
new file mode 100644
index 00000000..d85e6eae
--- /dev/null
+++ b/tests/auto/controls/data/spinbox/sp_editingfinished.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+
+Row {
+    width: 100
+    height: 50
+    spacing: 10
+
+    property alias control1: _control1
+    property alias control2: _control2
+    SpinBox {
+        id: _control1
+        property bool myeditingfinished: false
+        onEditingFinished: myeditingfinished = true
+    }
+    SpinBox {
+        id: _control2
+        property bool myeditingfinished: false
+        onEditingFinished: myeditingfinished = true
+    }
+}
diff --git a/tests/auto/controls/data/textfield/tf_editingfinished.qml b/tests/auto/controls/data/textfield/tf_editingfinished.qml
new file mode 100644
index 00000000..d38423a4
--- /dev/null
+++ b/tests/auto/controls/data/textfield/tf_editingfinished.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+
+Row {
+    width: 100
+    height: 50
+    spacing: 10
+
+    property alias control1: _control1
+    property alias control2: _control2
+    TextField {
+        id: _control1
+        text: 'A'
+        property bool myeditingfinished: false
+        onEditingFinished: myeditingfinished = true
+    }
+    TextField {
+        id: _control2
+        text: 'B'
+        property bool myeditingfinished: false
+        onEditingFinished: myeditingfinished = true
+    }
+}
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 9a68907c..124ab881 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -546,6 +546,36 @@ Item {
             spinbox.destroy()
         }
 
+        function test_editingFinished() {
+            var component = Qt.createComponent("spinbox/sp_editingfinished.qml")
+            compare(component.status, Component.Ready)
+            var test =  component.createObject(container);
+            verify(test !== null, "test control created is null")
+            var control1 = test.control1
+            verify(control1 !== null)
+            var control2 = test.control2
+            verify(control2 !== null)
+
+            control1.forceActiveFocus()
+            verify(control1.activeFocus)
+            verify(!control2.activeFocus)
+
+            verify(control1.myeditingfinished === false)
+            verify(control2.myeditingfinished === false)
+
+            keyPress(Qt.Key_Tab)
+            verify(!control1.activeFocus)
+            verify(control2.activeFocus)
+            verify(control1.myeditingfinished === true)
+
+            keyPress(Qt.Key_Enter)
+            verify(!control1.activeFocus)
+            verify(control2.activeFocus)
+            verify(control2.myeditingfinished === true)
+
+            test.destroy()
+        }
+
         function test_construction() {
             // onValueChanged should not be emitted during construction.
             var root = Qt.createQmlObject("
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 6a176997..a5dc2d87 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -356,5 +356,35 @@ TestCase {
         verify(!control.control3.activeFocus)
         control.destroy()
     }
+
+    function test_editingFinished() {
+        var component = Qt.createComponent("textfield/tf_editingfinished.qml")
+        compare(component.status, Component.Ready)
+        var test =  component.createObject(container);
+        verify(test !== null, "test control created is null")
+        var control1 = test.control1
+        verify(control1 !== null)
+        var control2 = test.control2
+        verify(control2 !== null)
+
+        control1.forceActiveFocus()
+        verify(control1.activeFocus)
+        verify(!control2.activeFocus)
+
+        verify(control1.myeditingfinished === false)
+        verify(control2.myeditingfinished === false)
+
+        keyPress(Qt.Key_Tab)
+        verify(!control1.activeFocus)
+        verify(control2.activeFocus)
+        verify(control1.myeditingfinished === true)
+
+        keyPress(Qt.Key_Enter)
+        verify(!control1.activeFocus)
+        verify(control2.activeFocus)
+        verify(control2.myeditingfinished === true)
+
+        test.destroy()
+    }
 }
 }