diff options
-rw-r--r-- | .gitignore | 3 | ||||
-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 |
7 files changed, 14 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 53f5c6eb5..b66341f8f 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 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); |