osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Remove last remnants of Qt5MacExtras 

MacExtras has been both obsoleted by Qt5 and unused by Wireshark code.
https://doc.qt.io/qt-5/qtmac-obsolete.html
This commit is contained in:
Joerg Mayer 2021-11-22 09:58:53 +01:00 committed by Wireshark GitLab Utility
parent 56d100d6ea
commit 769be50d76
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1250,7 +1250,6 @@ if(BUILD_wireshark)
Qt5Widgets
)
if(APPLE)
list(APPEND QT_PACKAGELIST Qt5MacExtras)
ws_find_package(Sparkle ENABLE_SPARKLE HAVE_SOFTWARE_UPDATE)
endif()
if(WIN32)
@ -1272,9 +1271,6 @@ if(BUILD_wireshark)
list(APPEND QT_INCLUDE_DIRS /usr/local/opt/qt5/include)
endif()
set(QT_FOUND ON)
if(Qt5MacExtras_FOUND)
set(QT_MACEXTRAS_LIB 1)
endif()
endif()
# MaxMind DB address resolution

3
cmakeconfig.h.in
View File

@ -283,9 +283,6 @@
/* Define if we have QtMultimedia */
#define QT_MULTIMEDIA_LIB 1
/* Define if we have QtMacExtras */
#cmakedefine QT_MACEXTRAS_LIB 1
/* Build androiddump with libpcap instead of wireshark stuff */
#cmakedefine ANDROIDDUMP_USE_LIBPCAP 1