diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-04-09 09:52:04 +0800 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2018-04-09 04:09:28 +0000 |
| commit | 8b93e6d6a2475b2e8072acaf8b7f63f6b5bff98d (patch) | |
| tree | 44691b93d46e271506c831bfa534a97709db3fba /Makefile.am | |
| parent | f0fed342165145461ed88358d2fc8985d15f3745 (diff) | |
Autotools: More Qt4 removal.
Change-Id: I6609160530d2e2f0ca47c324de48aa659c253bcf
Reviewed-on: https://code.wireshark.org/review/26812
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7e5485d4c4..6447a39846 100644 --- a/Makefile.am +++ b/Makefile.am @@ -422,10 +422,6 @@ if HAVE_Qt wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark-qt.cpp wireshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(Qt_CFLAGS) -# Define compatibility macros for Qt 4.8 -if HAVE_QT_VERSION_4 -wireshark_CPPFLAGS += -DQ_NULLPTR=NULL -endif wireshark_LDFLAGS = $(AM_LDFLAGS) $(Qt_LDFLAGS) |