Commit 0eebf6b8 authored by Andras Becsi's avatar Andras Becsi
Browse files

Fix Menu ui delegate after on__MenuClosed has been renamed


The internal on__MenuClosed signal has been renamed
to onAboutToHide in qtquickcontrols. Also update some
import versions while we're at it.
This patch also adds examples OSX application bundles
to .gitignore which only contained the unix binaries.

Change-Id: If1d91cb65987dda6d0e10794c1649b1b4e1ccde3
Reviewed-by: default avatarAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Showing with 14 additions and 11 deletions
......@@ -9,8 +9,11 @@ src/core/core_generated.gyp
src/core/gypfiles
src/core/qmake_extras.gypi
examples/webengine/quicknanobrowser/quicknanobrowser
examples/webengine/quicknanobrowser/quicknanobrowser.app
examples/webenginewidgets/browser/browser
examples/webenginewidgets/browser/browser.app
examples/webenginewidgets/fancybrowser/fancybrowser
examples/webenginewidgets/fancybrowser/fancybrowser.app
tests/quicktestbrowser/quicktestbrowser
tests/**/tst_*
......
......@@ -34,7 +34,7 @@
**
****************************************************************************/
import QtQuick.Dialogs 1.1
import QtQuick.Dialogs 1.2
MessageDialog {
icon: StandardIcon.Information
......
......@@ -34,12 +34,12 @@
**
****************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.0 as Controls
import QtQuick 2.5
import QtQuick.Controls 1.4 as Controls
Controls.Menu {
signal done()
// Use private API for now
on__MenuClosed: done();
onAboutToHide: done();
}
......@@ -34,8 +34,8 @@
**
****************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.0 as Controls
import QtQuick 2.5
import QtQuick.Controls 1.4 as Controls
Controls.MenuItem { }
......@@ -34,7 +34,7 @@
**
****************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.0 as Controls
import QtQuick 2.5
import QtQuick.Controls 1.4 as Controls
Controls.MenuSeparator { }
......@@ -34,7 +34,7 @@
**
****************************************************************************/
import QtQuick 2.1
import QtQuick 2.5
Item {
id: bubble
......
......@@ -35,9 +35,9 @@
****************************************************************************/
// FIXME: prompt missing in Qt Quick Dialogs atm. Make our own for now.
import QtQuick.Controls 1.1
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.0
import QtQuick 2.0
import QtQuick 2.5
ApplicationWindow {
signal input(string text);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment