From fc9f93791df64c7d9fde46994eaec908c4d40ab9 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 28 Dec 2018 17:15:27 +0100 Subject: [PATCH] Remove Qt5::Xml dependency --- CMakeLists.txt | 4 ++-- Dockerfile | 2 +- README.md | 2 +- dist/fedora/strawberry.spec.in | 1 - dist/opensuse/strawberry.spec.in | 1 - dist/windows/strawberry-debug-x64.nsi.in | 2 -- dist/windows/strawberry-debug-x86.nsi.in | 2 -- dist/windows/strawberry-x64.nsi.in | 2 -- dist/windows/strawberry-x86.nsi.in | 2 -- 9 files changed, 4 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc12b0f3..b6baf69a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ endif(WIN32) # QT set(QT_MIN_VERSION 5.5.1) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql) if(X11_FOUND) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) endif() @@ -134,7 +134,7 @@ if(WIN32) find_package(Qt5 REQUIRED COMPONENTS WinExtras) endif() -set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml) +set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql) if(DBUS_FOUND) set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) diff --git a/Dockerfile b/Dockerfile index 298c4c510..1d4989651 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ run zypper --non-interactive --gpg-auto-import-keys install \ glibc-devel glib2-devel glib2-tools dbus-1-devel alsa-devel libpulse-devel libnotify-devel \ boost-devel protobuf-devel sqlite3-devel taglib-devel \ gstreamer-devel gstreamer-plugins-base-devel libxine-devel vlc-devel \ - libQt5Core-devel libQt5Gui-devel libQt5Widgets-devel libQt5Concurrent-devel libQt5Network-devel libQt5Sql-devel libQt5Xml-devel \ + libQt5Core-devel libQt5Gui-devel libQt5Widgets-devel libQt5Concurrent-devel libQt5Network-devel libQt5Sql-devel \ libQt5DBus-devel libqt5-qtx11extras-devel libQt5Gui-private-headers-devel libqt5-qtbase-common-devel \ libcdio-devel libgpod-devel libplist-devel libmtp-devel libusbmuxd-devel libchromaprint-devel diff --git a/README.md b/README.md index 3e3066d25..be573552e 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ To build Strawberry from source you need the following installed on your system * [GCC](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/) compiler * [Protobuf library and compiler](https://developers.google.com/protocol-buffers/) * [Boost development headers](https://www.boost.org/) -* [Qt 5 with components Core, Gui, Widgets, Concurrent, Network, Sql and Xml](https://www.qt.io/) +* [Qt 5 with components Core, Gui, Widgets, Concurrent, Network and Sql](https://www.qt.io/) * [Qt 5 components X11Extras and DBus for Linux/BSD, MacExtras for macOS and WinExtras for Windows](https://www.qt.io/) * [SQLite3](https://www.sqlite.org) * [TagLib 1.11.1 or higher](http://taglib.org/) diff --git a/dist/fedora/strawberry.spec.in b/dist/fedora/strawberry.spec.in index 15e611456..f8d7a2323 100644 --- a/dist/fedora/strawberry.spec.in +++ b/dist/fedora/strawberry.spec.in @@ -31,7 +31,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(gstreamer-1.0) diff --git a/dist/opensuse/strawberry.spec.in b/dist/opensuse/strawberry.spec.in index e71c961de..4d8a6bce1 100644 --- a/dist/opensuse/strawberry.spec.in +++ b/dist/opensuse/strawberry.spec.in @@ -38,7 +38,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(gstreamer-1.0) diff --git a/dist/windows/strawberry-debug-x64.nsi.in b/dist/windows/strawberry-debug-x64.nsi.in index 730e618cb..497dfd049 100644 --- a/dist/windows/strawberry-debug-x64.nsi.in +++ b/dist/windows/strawberry-debug-x64.nsi.in @@ -153,7 +153,6 @@ Section "Strawberry" Strawberry File "Qt5Network.dll" File "Qt5Sql.dll" File "Qt5Widgets.dll" - File "Qt5Xml.dll" File "Qt5WinExtras.dll" File "zlib1.dll" File "libxine-2.dll" @@ -395,7 +394,6 @@ Section "Uninstall" Delete "$INSTDIR\Qt5Network.dll" Delete "$INSTDIR\Qt5Sql.dll" Delete "$INSTDIR\Qt5Widgets.dll" - Delete "$INSTDIR\Qt5Xml.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\libxine-2.dll" diff --git a/dist/windows/strawberry-debug-x86.nsi.in b/dist/windows/strawberry-debug-x86.nsi.in index dbc3ecc24..0d170c6f6 100644 --- a/dist/windows/strawberry-debug-x86.nsi.in +++ b/dist/windows/strawberry-debug-x86.nsi.in @@ -153,7 +153,6 @@ Section "Strawberry" Strawberry File "Qt5Network.dll" File "Qt5Sql.dll" File "Qt5Widgets.dll" - File "Qt5Xml.dll" File "Qt5WinExtras.dll" File "zlib1.dll" File "libxine-2.dll" @@ -395,7 +394,6 @@ Section "Uninstall" Delete "$INSTDIR\Qt5Network.dll" Delete "$INSTDIR\Qt5Sql.dll" Delete "$INSTDIR\Qt5Widgets.dll" - Delete "$INSTDIR\Qt5Xml.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\libxine-2.dll" diff --git a/dist/windows/strawberry-x64.nsi.in b/dist/windows/strawberry-x64.nsi.in index b7d2ac3f2..7062f6978 100644 --- a/dist/windows/strawberry-x64.nsi.in +++ b/dist/windows/strawberry-x64.nsi.in @@ -153,7 +153,6 @@ Section "Strawberry" Strawberry File "Qt5Network.dll" File "Qt5Sql.dll" File "Qt5Widgets.dll" - File "Qt5Xml.dll" File "Qt5WinExtras.dll" File "zlib1.dll" ;File "libmpcdec-5.dll" @@ -363,7 +362,6 @@ Section "Uninstall" Delete "$INSTDIR\Qt5Network.dll" Delete "$INSTDIR\Qt5Sql.dll" Delete "$INSTDIR\Qt5Widgets.dll" - Delete "$INSTDIR\Qt5Xml.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\zlib1.dll" ;Delete "$INSTDIR\libmpcdec-5.dll" diff --git a/dist/windows/strawberry-x86.nsi.in b/dist/windows/strawberry-x86.nsi.in index ccb732f59..66c3c09a8 100644 --- a/dist/windows/strawberry-x86.nsi.in +++ b/dist/windows/strawberry-x86.nsi.in @@ -153,7 +153,6 @@ Section "Strawberry" Strawberry File "Qt5Network.dll" File "Qt5Sql.dll" File "Qt5Widgets.dll" - File "Qt5Xml.dll" File "Qt5WinExtras.dll" File "zlib1.dll" ;File "libmpcdec-5.dll" @@ -363,7 +362,6 @@ Section "Uninstall" Delete "$INSTDIR\Qt5Network.dll" Delete "$INSTDIR\Qt5Sql.dll" Delete "$INSTDIR\Qt5Widgets.dll" - Delete "$INSTDIR\Qt5Xml.dll" Delete "$INSTDIR\Qt5WinExtras.dll" Delete "$INSTDIR\zlib1.dll" ;Delete "$INSTDIR\libmpcdec-5.dll"