diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 03:00:17 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 03:00:17 +0200 |
| commit | 4cda4427b6a2e07dd406362cf7b643b971706b2c (patch) | |
| tree | 72525327d3070f85def2c379bf98a2c4e09bbc6a | |
| parent | 38f7cecf6f74ef73e1a86ea48a74364e130511a7 (diff) | |
| parent | 654de8242411dae548795f9b17648608f8a8c28d (diff) | |
| download | qtquickcontrols-4cda4427b6a2e07dd406362cf7b643b971706b2c.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8272137b2bacbb2c446c3b426d864e946261e4fb
| -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 6ef30f78..600fb8ae 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.12.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) |