Merge remote-tracking branch 'origin/4.3' into 4.4

Conflicts: src/plugins/qmlprofiler/qmlprofilertraceview.cpp Change-Id: Ib1d75a8572f650898cb598d008867e2c0514d752
2017-08-14 12:37:06 +02:00
parent 63551d7711 a094841bdd
commit b5f49273b0
8 changed files with 139 additions and 9 deletions
@@ -130,8 +130,6 @@ Item {
                    exportMenuItem.enabled = !backendValue.isAttachedProperty()
                }

-                onAboutToHide: menuLoader.active = false
-
                Controls.MenuItem {
                    text: qsTr("Reset")
                    onTriggered: {