From 654de8242411dae548795f9b17648608f8a8c28d Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 29 Mar 2018 11:29:57 +0200 Subject: Do not treat winrt as touch based mobile platform 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 --- src/dialogs/plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dialogs/plugin.cpp') 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) -- cgit v1.2.1