From 64f90a7912eb85aa52563c824cc388966d3f0844 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 22 Oct 2020 23:11:44 +0200 Subject: [PATCH] Remove Qt MacExtras, no longer used --- CMakeLists.txt | 12 ------------ README.md | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b6f1829b..0bf701fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,9 +151,6 @@ endif() if(DBUS_FOUND) list(APPEND QT_COMPONENTS DBus) endif() -if(APPLE) - list(APPEND QT_COMPONENTS MacExtras) -endif() if(WIN32) list(APPEND QT_COMPONENTS WinExtras) endif() @@ -176,10 +173,6 @@ if(BUILD_WITH_QT6) set(QtX11Extras_LIBRARIES Qt6::X11Extras) list(APPEND QT_LIBRARIES Qt6::X11Extras) endif() - if(Qt6MacExtras_FOUND) - set(QtMacExtras_LIBRARIES Qt6::MacExtras) - list(APPEND QT_LIBRARIES Qt6::MacExtras) - endif() if(Qt6WinExtras_FOUND) set(QtWinExtras_LIBRARIES Qt6::WinExtras) list(APPEND QT_LIBRARIES Qt6::WinExtras) @@ -209,11 +202,6 @@ elseif(BUILD_WITH_QT5) list(APPEND QT_LIBRARIES ${Qt5X11Extras_LIBRARIES}) list(APPEND QT_INCLUDE_DIRS ${Qt5X11Extras_INCLUDE_DIRS}) endif() - if(Qt5MacExtras_FOUND) - set(QtMacExtras_LIBRARIES ${Qt5MacExtras_LIBRARIES}) - list(APPEND QT_LIBRARIES ${Qt5MacExtras_LIBRARIES}) - list(APPEND QT_INCLUDE_DIRS ${Qt5MacExtras_INCLUDE_DIRS}) - endif() if(Qt5WinExtras_FOUND) set(QtWinExtras_LIBRARIES ${Qt5WinExtras_LIBRARIES}) list(APPEND QT_LIBRARIES ${Qt5WinExtras_LIBRARIES}) diff --git a/README.md b/README.md index 1fba27c2a..15bdbb1ce 100644 --- a/README.md +++ b/README.md @@ -65,11 +65,11 @@ To build Strawberry from source you need the following installed on your system * [GLib](https://developer.gnome.org/glib/) * [Protobuf library and compiler](https://developers.google.com/protocol-buffers/) * [Qt 5.8 or higher (or Qt 6) with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/) -* [Qt components X11Extras and DBus for Linux/BSD, MacExtras for macOS and WinExtras for Windows](https://www.qt.io/) +* [Qt components X11Extras and D-Bus for Linux/BSD and WinExtras for Windows](https://www.qt.io/) * [SQLite 3.9 or newer with FTS5](https://www.sqlite.org) * [Chromaprint library](https://acoustid.org/chromaprint) * [ALSA library (linux)](https://www.alsa-project.org/) -* [DBus (linux)](https://www.freedesktop.org/wiki/Software/dbus/) +* [D-Bus (linux)](https://www.freedesktop.org/wiki/Software/dbus/) * [PulseAudio (linux optional)](https://www.freedesktop.org/wiki/Software/PulseAudio/?) * [GStreamer](https://gstreamer.freedesktop.org/) or [VLC](https://www.videolan.org) * [GnuTLS](https://www.gnutls.org/)