diff --git a/.gitignore b/.gitignore index 53f5c6eb56bbefd0c67e28cc60e03e35bd347db1..b66341f8f94bc469024bc219b129f61ab5fabaae 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 be74dc000d84a768a1f670e13d5c7bf61dbd0994..998c953cb2dad95eca29744c56cff981c7e6a086 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 7cc58f947bfda144736bf19437e960a9340fcb86..e6fec297f4faf77989d4c080cc6e49ef4c5a719e 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 2b17b6e2751166ed4d310e6e2a2c5eb13fd9b713..7ed5bef4198c4e16fdeff86c9c1c470297bc6259 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 2c1c2904f9f007d6f1893c2b293abde08737a0da..1150688700e8b612d7e7b2eb33b3c3b4ed178188 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 4328eae4090339d3241bf12cdcc5faf2d493b725..17cf5b79780d502b128302e5910f7a7748eb37f3 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 9ac2b9dc2f547239d5000d4948ec5401b5c60d34..fb0881320357cf80b15100f9e82a620269d7dd72 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);