diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 12:23:32 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-12 11:37:12 +0000 |
| commit | 0eebf6b8345333ca753664d8a126aca524fa8316 (patch) | |
| tree | a4b15fa80ecb5f061b70a0d6413504be9a28bf0d /src/webengine | |
| parent | 9b42c2b1275e61e4533f59157d4114509d46be55 (diff) | |
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: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/ui/AlertDialog.qml | 2 | ||||
| -rw-r--r-- | src/webengine/ui/Menu.qml | 6 | ||||
| -rw-r--r-- | src/webengine/ui/MenuItem.qml | 4 | ||||
| -rw-r--r-- | src/webengine/ui/MenuSeparator.qml | 4 | ||||
| -rw-r--r-- | src/webengine/ui/MessageBubble.qml | 2 | ||||
| -rw-r--r-- | src/webengine/ui/PromptDialog.qml | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/webengine/ui/AlertDialog.qml b/src/webengine/ui/AlertDialog.qml index be74dc000..998c953cb 100644 --- a/src/webengine/ui/AlertDialog.qml +++ b/src/webengine/ui/AlertDialog.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick.Dialogs 1.1 +import QtQuick.Dialogs 1.2 MessageDialog { icon: StandardIcon.Information diff --git a/src/webengine/ui/Menu.qml b/src/webengine/ui/Menu.qml index 7cc58f947..e6fec297f 100644 --- a/src/webengine/ui/Menu.qml +++ b/src/webengine/ui/Menu.qml @@ -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(); } diff --git a/src/webengine/ui/MenuItem.qml b/src/webengine/ui/MenuItem.qml index 2b17b6e27..7ed5bef41 100644 --- a/src/webengine/ui/MenuItem.qml +++ b/src/webengine/ui/MenuItem.qml @@ -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 { } diff --git a/src/webengine/ui/MenuSeparator.qml b/src/webengine/ui/MenuSeparator.qml index 2c1c2904f..115068870 100644 --- a/src/webengine/ui/MenuSeparator.qml +++ b/src/webengine/ui/MenuSeparator.qml @@ -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 { } diff --git a/src/webengine/ui/MessageBubble.qml b/src/webengine/ui/MessageBubble.qml index 4328eae40..17cf5b797 100644 --- a/src/webengine/ui/MessageBubble.qml +++ b/src/webengine/ui/MessageBubble.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.5 Item { id: bubble diff --git a/src/webengine/ui/PromptDialog.qml b/src/webengine/ui/PromptDialog.qml index 9ac2b9dc2..fb0881320 100644 --- a/src/webengine/ui/PromptDialog.qml +++ b/src/webengine/ui/PromptDialog.qml @@ -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); |