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/qquickplatformmenu.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/imports/platform/qquickplatformmenu.cpp') diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp index 3fb93be9..17d3b2ce 100644 --- a/src/imports/platform/qquickplatformmenu.cpp +++ b/src/imports/platform/qquickplatformmenu.cpp @@ -52,9 +52,7 @@ #include #include -#ifdef QT_WIDGETS_LIB -#include "widgets/qwidgetplatformmenu_p.h" -#endif +#include "widgets/qwidgetplatform_p.h" QT_BEGIN_NAMESPACE @@ -185,10 +183,9 @@ QPlatformMenu * QQuickPlatformMenu::create() if (!m_handle) m_handle = QGuiApplicationPrivate::platformTheme()->createPlatformMenu(); -#ifdef QT_WIDGETS_LIB if (!m_handle) - m_handle = new QWidgetPlatformMenu; -#endif + m_handle = QWidgetPlatform::createMenu(); + qCDebug(qtLabsPlatformMenus) << "Menu ->" << m_handle; if (m_handle) { -- cgit v1.2.3