diff options
| -rw-r--r-- | ui/qt/utils/qt_ui_utils.h | 5 | ||||
| -rw-r--r-- | ui/qt/widgets/drag_drop_toolbar.h | 1 |
2 files changed, 6 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. diff --git a/ui/qt/widgets/drag_drop_toolbar.h b/ui/qt/widgets/drag_drop_toolbar.h index 6de98ef628..73e93384a1 100644 --- a/ui/qt/widgets/drag_drop_toolbar.h +++ b/ui/qt/widgets/drag_drop_toolbar.h @@ -24,6 +24,7 @@ #include <QToolBar> #include <QPoint> +#include <ui/qt/utils/qt_ui_utils.h> class DragDropToolBar : public QToolBar { |