summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-06-13 12:38:51 +0200
committerMichal Klocek <michal.klocek@qt.io>2016-08-18 09:23:03 +0000
commitbaeb20b2e720f5c683cf3810116d827e1561c4b2 (patch)
treeabaf7c153e369c2043b46621ab78fbe42ce74421 /src/src.pro
parent6534b09073791398bad99863821740e986915bff (diff)
Add Qt Quick Controls 2 support for dialogs
QtQuickControls1 does not handle embedded platforms too well. In case of eglfs platform we crash badly - only one window is supported. QtQuickControls2 on the other hand lacks the native look on desktop. Therefore on desktop platforms keep using QtQuickControls1, and on eglfs use QtQuickControls2. QtQuick.Dialogs are not implemented for QtQuickControls2, moreover required authentication dialog and prompt dialog are neither implemented in QtQuickControls1. As a workaround make new dialogs to give consistent look and feel. Replace close() with reject() signal in java script prompt dialog to unify handling between qqc1 and qqc2 [ChangeLog][QtWebEngine][General] Qt WebEngine (QML) now optionally uses Qt Quick 2 Controls to show standard dialogs. Task-number: QTBUG-53467 Task-number: QTBUG-51177 Change-Id: I42f9506357bbb82d4f04465f30a18c8013439e25 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro
index 64c1703fe..00e8301be 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -34,8 +34,10 @@ isQMLTestSupportApiEnabled() {
# FIXME: We probably want a bit more control over config options to tweak what to build/ship or not.
# Another example of where this could be necessary is to make it easy to build proprietery codecs support.
-!contains(WEBENGINE_CONFIG, no_ui_delegates): SUBDIRS += webengine/ui
-
+!contains(WEBENGINE_CONFIG, no_ui_delegates) {
+ SUBDIRS += webengine/ui \
+ webengine/ui2
+}
qtHaveModule(widgets) {
SUBDIRS += webenginewidgets
plugins.depends = webenginewidgets