diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-15 19:57:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-15 19:10:32 +0000 |
| commit | 0c76501617fda1e0ffa87334d3892f97e9d7d192 (patch) | |
| tree | 17a144965445822d4cf504244cb088e931a7eed1 /src/imports/platform/qquickplatformmenu.cpp | |
| parent | f8542bd1332224fe30ad2aea1388647933838cab (diff) | |
Platform: offload widget fallback creation to qwidgetplatform_p.h
Change-Id: If51b359fa44a539c236e1a070e69451c75e190f7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformmenu.cpp')
| -rw-r--r-- | src/imports/platform/qquickplatformmenu.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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 <QtQuick/qquickwindow.h> #include <QtQuick/qquickitem.h> -#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) { |