From ed4d0a3dea2d769ec1b2febd59deae4d231ea104 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Tue, 28 Oct 2014 13:47:40 +0100
Subject: [PATCH] Don't deploy Widget*Dialog.qml on touch platforms
If qmlimportscanner sees these files, it will assume that the widgets
module is necessary.
Change-Id: I5cf9ab7f8686bd1988cd7c16d35b5f04ad2e92a8
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
---
src/dialogs/dialogs.pro | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro
index fd85dcba9..93db78f40 100644
--- a/src/dialogs/dialogs.pro
+++ b/src/dialogs/dialogs.pro
@@ -39,15 +39,17 @@ HEADERS += \
qquickabstractdialog_p.h \
qquickdialog_p.h
+WIDGET_DIALOGS_QML_FILES = \
+ WidgetMessageDialog.qml \
+ WidgetFileDialog.qml \
+ WidgetColorDialog.qml \
+ WidgetFontDialog.qml
+
DIALOGS_QML_FILES += \
DefaultMessageDialog.qml \
- WidgetMessageDialog.qml \
DefaultFileDialog.qml \
- WidgetFileDialog.qml \
DefaultColorDialog.qml \
- WidgetColorDialog.qml \
DefaultFontDialog.qml \
- WidgetFontDialog.qml \
DefaultDialogWrapper.qml \
qml/ColorSlider.qml \
qml/DefaultWindowDecoration.qml \
@@ -65,7 +67,12 @@ DIALOGS_QML_FILES += \
images/crosshairs.png \
images/slider_handle.png \
images/sunken_frame.png \
- images/window_border.png
+ images/window_border.png \
+ $$WIDGET_DIALOGS_QML_FILES
+
+ios|android|blackberry|winrt {
+ DIALOGS_QML_FILES -= $$WIDGET_DIALOGS_QML_FILES
+}
QT += quick-private gui gui-private core core-private qml qml-private
--
GitLab