diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-07-24 11:59:50 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-30 05:21:37 +0000 |
| commit | 32b446d5a8f146565b81324d1a18bcb053e07c5f (patch) | |
| tree | 73c0d31a5d63e4c977601461968cd63774510dfa /ui/qt/utils/qt_ui_utils.h | |
| parent | 28c874da179a520b1cb5113eb33e2e8b3cb8f48d (diff) | |
Define Q_NULLPTR as NULL if not already defined
it is not supported with Qt 4.x
Change-Id: Ie98d5e03d471869e08f5354a509c3317c7c780d7
Reviewed-on: https://code.wireshark.org/review/22831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/utils/qt_ui_utils.h')
| -rw-r--r-- | ui/qt/utils/qt_ui_utils.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/qt/utils/qt_ui_utils.h b/ui/qt/utils/qt_ui_utils.h index 3eb159c5f9..781cf9e1c9 100644 --- a/ui/qt/utils/qt_ui_utils.h +++ b/ui/qt/utils/qt_ui_utils.h @@ -54,6 +54,11 @@ struct epan_range; } #endif /* __cplusplus */ +// Needed to support Qt 4.x +#ifndef Q_NULLPTR +#define Q_NULLPTR NULL +#endif + /** Create a glib-compatible copy of a QString. * * @param q_string A QString. |