diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-03-29 11:29:57 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-04-05 08:14:21 +0000 |
| commit | 654de8242411dae548795f9b17648608f8a8c28d (patch) | |
| tree | 63807643d4096324fd1cf854b5b9d8903268f69f | |
| parent | a41a3268c7b1f1d510c452e5430db0d5e5ee4055 (diff) | |
| download | qtquickcontrols-654de8242411dae548795f9b17648608f8a8c28d.tar.gz | |
Do not treat winrt as touch based mobile platformv5.11.0-beta4
While winrt used to be a touch based, mobile platform before, focus has
shifted. Widgets were supported from the start and while they are not
the main area of focus, disallowing widget dialogs is not the right
approach here.
Furthermore the current logic of whether widget dialogs should be
registered does not work on winrt. The parts containing widgets either
have to be removed completely or bound to the same specific conditions
everywhere.
The mix of setting "no_desktop" and not having widget dialogs
unconditionally for "mobile platforms", but then doing additional checks
when registering widget dialog types breaks the concept at least for
winrt.
Task-number: QTBUG-67144
Change-Id: I36fc5b6f8729bbd128faf1de95fc0bba297ab0e9
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/dialogs/dialogs.pro | 2 | ||||
| -rw-r--r-- | src/dialogs/plugin.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index c053efd7..63a29783 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,5 @@ load(qt_build_config) CONFIG += warning_clean -android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop +android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop MODULE_VERSION = 5.11.0 diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro index 362f5584..ef0878ce 100644 --- a/src/dialogs/dialogs.pro +++ b/src/dialogs/dialogs.pro @@ -72,7 +72,7 @@ DIALOGS_QML_FILES += \ images/window_border.png \ $$WIDGET_DIALOGS_QML_FILES -ios|android|blackberry|winrt { +ios|android|blackberry { DIALOGS_QML_FILES -= $$WIDGET_DIALOGS_QML_FILES } diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 8ee1e65d..1e6740d5 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -214,7 +214,7 @@ protected: bool mobileTouchPlatform = false; #if defined(Q_OS_IOS) mobileTouchPlatform = true; -#elif defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) || defined(Q_OS_WINRT) +#elif defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) const auto devices = QTouchDevice::devices(); for (const QTouchDevice *dev : devices) if (dev->type() == QTouchDevice::TouchScreen) |