diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 09:34:06 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-21 09:34:26 +0200 |
| commit | ef63be14186607c2b806f45d257d8aba6e9a6472 (patch) | |
| tree | f86e663d32e2ad8cfd6ac307dd11526e561c66ba /src/imports/platform | |
| parent | 7eace7ac5a74b68338b948857c4f2bc2e58abc48 (diff) | |
| parent | d6c8721476607f22896785baa547a7551015f164 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Idb1895dae2870dbed860ba3106fe52b01d733504
Diffstat (limited to 'src/imports/platform')
| -rw-r--r-- | src/imports/platform/widgets/qwidgetplatform_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/platform/widgets/qwidgetplatform_p.h b/src/imports/platform/widgets/qwidgetplatform_p.h index 5a983a33..c203406c 100644 --- a/src/imports/platform/widgets/qwidgetplatform_p.h +++ b/src/imports/platform/widgets/qwidgetplatform_p.h @@ -121,6 +121,7 @@ namespace QWidgetPlatform #if defined(QT_WIDGETS_LIB) && QT_CONFIG(menu) return createWidget<QWidgetPlatformMenu>("Menu", parent); #else + Q_UNUSED(parent); return nullptr; #endif } @@ -128,6 +129,7 @@ namespace QWidgetPlatform #if defined(QT_WIDGETS_LIB) && QT_CONFIG(menu) return createWidget<QWidgetPlatformMenuItem>("MenuItem", parent); #else + Q_UNUSED(parent); return nullptr; #endif } @@ -135,11 +137,15 @@ namespace QWidgetPlatform #ifndef QT_NO_SYSTEMTRAYICON return createWidget<QWidgetPlatformSystemTrayIcon>("SystemTrayIcon", parent); #else + Q_UNUSED(parent); return nullptr; #endif } static inline QPlatformDialogHelper *createDialog(QPlatformTheme::DialogType type, QObject *parent = nullptr) { +#if !defined(QT_WIDGETS_LIB) || !(QT_CONFIG(colordialog) || QT_CONFIG(filedialog) || QT_CONFIG(fontdialog) || QT_CONFIG(messagebox)) + Q_UNUSED(parent); +#endif switch (type) { #if defined(QT_WIDGETS_LIB) && QT_CONFIG(colordialog) case QPlatformTheme::ColorDialog: return createWidget<QWidgetPlatformColorDialog>("ColorDialog", parent); |