From 4e732b87d2b898b9720bd128247beb202fb4aaff Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 11 Nov 2011 14:50:20 +0100 Subject: Factor out QPlatformTheme from QPlatformPlugin. Implement QCocoaPlatformTheme. The menus and dialog API is moved from the platform to the theme plugin. (Both APIs contain references to QtWidget classes, which we are working towards removing.) The theme plugin is created after the platform plugin, first by asking the platform plugin, then by looking for a separate plugin if the platform does not specify a theme. Initial-patch-by: Morten Sorvig Reviewed-by: Friedemann Kleint Change-Id: I2778cdd3a205c4ce35ead93e39fe6b4cd58a39f9 Reviewed-by: Friedemann Kleint --- src/widgets/dialogs/qdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/dialogs/qdialog.cpp') diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index a0b0cdc564..363d3bf592 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -66,8 +66,8 @@ QPlatformDialogHelper *QDialogPrivate::platformHelper() const if (!m_platformHelperCreated) { QDialogPrivate *ncThis = const_cast(this); m_platformHelperCreated = true; - m_platformHelper = QGuiApplicationPrivate::platformIntegration() - ->createPlatformDialogHelper(ncThis->q_func()); + m_platformHelper = QGuiApplicationPrivate::platformTheme() + ->createPlatformDialogHelper(ncThis->q_func()); if (m_platformHelper) ncThis->initHelper(m_platformHelper); } -- cgit v1.2.3