diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-11 14:50:20 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-11 15:22:02 +0100 |
| commit | 4e732b87d2b898b9720bd128247beb202fb4aaff (patch) | |
| tree | fa338154584c8c6e2feaa7e88b2316793799db51 /src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | |
| parent | c92d6130fe9df1dc6b42b9d66627cc905e13519b (diff) | |
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 <msorvig@trolltech.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: I2778cdd3a205c4ce35ead93e39fe6b4cd58a39f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsdialoghelpers.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 82fbd8c712..bd10efede1 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -1317,16 +1317,18 @@ namespace QWindowsDialogs { // QWindowsDialogHelperBase creation functions bool useHelper(const QDialog *dialog) { - switch (QWindowsDialogs::dialogType(dialog)) { - case QWindowsDialogs::FileDialog: - return true; - case QWindowsDialogs::ColorDialog: + if (dialog) { + switch (QWindowsDialogs::dialogType(dialog)) { + case QWindowsDialogs::FileDialog: + return true; + case QWindowsDialogs::ColorDialog: #ifdef USE_NATIVE_COLOR_DIALOG - return true; + return true; #endif - case QWindowsDialogs::FontDialog: - case QWindowsDialogs::UnknownType: - break; + case QWindowsDialogs::FontDialog: + case QWindowsDialogs::UnknownType: + break; + } } return false; } @@ -1335,6 +1337,8 @@ QPlatformDialogHelper *createHelper(QDialog *dialog) { if (QWindowsContext::verboseDialogs) qDebug("%s %p %s" , __FUNCTION__, dialog, dialog->metaObject()->className()); + if (!dialog) + return 0; switch (QWindowsDialogs::dialogType(dialog)) { case QWindowsDialogs::FileDialog: |