summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-05-11 12:23:32 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-05-12 11:37:12 +0000
commit0eebf6b8345333ca753664d8a126aca524fa8316 (patch)
treea4b15fa80ecb5f061b70a0d6413504be9a28bf0d
parent9b42c2b1275e61e4533f59157d4114509d46be55 (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>
-rw-r--r--.gitignore3
-rw-r--r--src/webengine/ui/AlertDialog.qml2
-rw-r--r--src/webengine/ui/Menu.qml6
-rw-r--r--src/webengine/ui/MenuItem.qml4
-rw-r--r--src/webengine/ui/MenuSeparator.qml4
-rw-r--r--src/webengine/ui/MessageBubble.qml2
-rw-r--r--src/webengine/ui/PromptDialog.qml4
7 files changed, 14 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 53f5c6eb..b66341f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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_*
diff --git a/src/webengine/ui/AlertDialog.qml b/src/webengine/ui/AlertDialog.qml
index be74dc00..998c953c 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 7cc58f94..e6fec297 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 2b17b6e2..7ed5bef4 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 2c1c2904..11506887 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 4328eae4..17cf5b79 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 9ac2b9dc..fb088132 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);