From 0c76501617fda1e0ffa87334d3892f97e9d7d192 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 15 Aug 2016 19:57:09 +0200 Subject: Platform: offload widget fallback creation to qwidgetplatform_p.h Change-Id: If51b359fa44a539c236e1a070e69451c75e190f7 Reviewed-by: J-P Nurmi --- src/imports/platform/qquickplatformdialog.cpp | 34 ++------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) (limited to 'src/imports/platform/qquickplatformdialog.cpp') diff --git a/src/imports/platform/qquickplatformdialog.cpp b/src/imports/platform/qquickplatformdialog.cpp index 6a772940..dee4335d 100644 --- a/src/imports/platform/qquickplatformdialog.cpp +++ b/src/imports/platform/qquickplatformdialog.cpp @@ -41,12 +41,7 @@ #include #include -#ifdef QT_WIDGETS_LIB -#include "widgets/qwidgetplatformcolordialog_p.h" -#include "widgets/qwidgetplatformfiledialog_p.h" -#include "widgets/qwidgetplatformfontdialog_p.h" -#include "widgets/qwidgetplatformmessagedialog_p.h" -#endif +#include "widgets/qwidgetplatform_p.h" QT_BEGIN_NAMESPACE @@ -346,31 +341,6 @@ void QQuickPlatformDialog::componentComplete() setParentWindow(findParentWindow()); } -static QPlatformDialogHelper *createWidgetDialog(QPlatformTheme::DialogType type, QObject *parent) -{ - QPlatformDialogHelper *dialog = nullptr; -#ifdef QT_WIDGETS_LIB - switch (type) { - case QPlatformTheme::ColorDialog: - dialog = new QWidgetPlatformColorDialog(parent); - break; - case QPlatformTheme::FileDialog: - dialog = new QWidgetPlatformFileDialog(parent); - break; - case QPlatformTheme::FontDialog: - dialog = new QWidgetPlatformFontDialog(parent); - break; - case QPlatformTheme::MessageDialog: - dialog = new QWidgetPlatformMessageDialog(parent); - break; - default: - Q_UNREACHABLE(); - break; - } -#endif - return dialog; -} - static const char *qmlTypeName(const QObject *object) { return object->metaObject()->className() + qstrlen("QQuickPlatform"); @@ -382,7 +352,7 @@ bool QQuickPlatformDialog::create() if (useNativeDialog()) m_handle = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(m_type); if (!m_handle) - m_handle = createWidgetDialog(m_type, this); + m_handle = QWidgetPlatform::createDialog(m_type, this); qCDebug(qtLabsPlatformDialogs) << qmlTypeName(this) << "->" << m_handle; if (m_handle) { onCreate(m_handle); -- cgit v1.2.3