From 5d159e0203bdd0e72153cce9ca5c0fe8483ba0db Mon Sep 17 00:00:00 2001 From: sudden6 Date: Fri, 11 Aug 2017 22:45:15 +0200 Subject: [PATCH] fix(dependency): remove unused qt sql dependency fix #4567 --- INSTALL.md | 26 ++++++++++++-------------- cmake/Dependencies.cmake | 2 -- qtox.pro | 2 +- simple_make.sh | 4 ---- windows/qtox.nsi | 5 ----- windows/qtox64.nsi | 5 ----- 6 files changed, 13 insertions(+), 31 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 93dece974..111c50a13 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -40,18 +40,18 @@ ## Dependencies -| Name | Version | Modules | -|---------------|-------------|-------------------------------------------------- | -| [Qt] | >= 5.5.0 | core, gui, network, opengl, sql, svg, widget, xml | -| [GCC]/[MinGW] | >= 4.8 | C++11 enabled | -| [toxcore] | = 0.1.\* | core, av | -| [FFmpeg] | >= 2.6.0 | avformat, avdevice, avcodec, avutil, swscale | -| [CMake] | >= 2.8.11 | | -| [OpenAL Soft] | >= 1.16.0 | | -| [qrencode] | >= 3.0.3 | | -| [sqlcipher] | >= 3.2.0 | | -| [pkg-config] | >= 0.28 | | -| [filteraudio] | >= 0.0.1 | optional dependency | +| Name | Version | Modules | +|---------------|-------------|----------------------------------------------| +| [Qt] | >= 5.5.0 | core, gui, network, opengl, svg, widget, xml | +| [GCC]/[MinGW] | >= 4.8 | C++11 enabled | +| [toxcore] | = 0.1.\* | core, av | +| [FFmpeg] | >= 2.6.0 | avformat, avdevice, avcodec, avutil, swscale | +| [CMake] | >= 2.8.11 | | +| [OpenAL Soft] | >= 1.16.0 | | +| [qrencode] | >= 3.0.3 | | +| [sqlcipher] | >= 3.2.0 | | +| [pkg-config] | >= 0.28 | | +| [filteraudio] | >= 0.0.1 | optional dependency | ## Optional dependencies @@ -335,8 +335,6 @@ sudo zypper install \ libQt5Concurrent-devel \ libQt5Network-devel \ libQt5OpenGL-devel \ - libQt5Sql-devel \ - libQt5Sql5-sqlite \ libQt5Xml-devel \ libXScrnSaver-devel \ libffmpeg-devel \ diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 8364ac367..a76162ca6 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -11,7 +11,6 @@ find_package(Qt5Gui REQUIRED) find_package(Qt5LinguistTools REQUIRED) find_package(Qt5Network REQUIRED) find_package(Qt5OpenGL REQUIRED) -find_package(Qt5Sql REQUIRED) find_package(Qt5Svg REQUIRED) find_package(Qt5Test REQUIRED) find_package(Qt5Widgets REQUIRED) @@ -27,7 +26,6 @@ add_dependency( Qt5::Gui Qt5::Network Qt5::OpenGL - Qt5::Sql Qt5::Svg Qt5::Widgets Qt5::Xml) diff --git a/qtox.pro b/qtox.pro index dea340d9b..44780ab68 100644 --- a/qtox.pro +++ b/qtox.pro @@ -27,7 +27,7 @@ unix:!freebsd { } -QT += core gui network xml opengl sql svg widgets +QT += core gui network xml opengl svg widgets TARGET = qtox TEMPLATE = app diff --git a/simple_make.sh b/simple_make.sh index 4a5cdf7ad..1c7ea451a 100755 --- a/simple_make.sh +++ b/simple_make.sh @@ -93,8 +93,6 @@ dnf_install() { qt-creator qt-devel qt-doc - sqlite - sqlite-devel ) sudo dnf install "${dnf_packages[@]}" } @@ -130,8 +128,6 @@ zypper_install() { libQt5OpenGL-devel libqt5-qtbase-common-devel libqt5-qtsvg-devel - libQt5Sql5-sqlite - libQt5Sql-devel libQt5Test-devel libQt5Xml-devel libsodium-devel diff --git a/windows/qtox.nsi b/windows/qtox.nsi index 551d50ef8..58e6919c0 100644 --- a/windows/qtox.nsi +++ b/windows/qtox.nsi @@ -266,11 +266,6 @@ Section "Install" ${SetOutPath} "$INSTDIR\bin\platforms" File /nonfatal "qtox\platforms\*.*" ${SetOutPath} "$INSTDIR\bin" - - ${CreateDirectory} "$INSTDIR\bin\sqldrivers" - ${SetOutPath} "$INSTDIR\bin\sqldrivers" - File /nonfatal "qtox\sqldrivers\*.*" - ${SetOutPath} "$INSTDIR\bin" # Create shortcuts ${CreateDirectory} "$SMPROGRAMS\qTox" diff --git a/windows/qtox64.nsi b/windows/qtox64.nsi index 4bac1c65d..c0191a5ec 100644 --- a/windows/qtox64.nsi +++ b/windows/qtox64.nsi @@ -266,11 +266,6 @@ Section "Install" ${SetOutPath} "$INSTDIR\bin\platforms" File /nonfatal "qtox\platforms\*.*" ${SetOutPath} "$INSTDIR\bin" - - ${CreateDirectory} "$INSTDIR\bin\sqldrivers" - ${SetOutPath} "$INSTDIR\bin\sqldrivers" - File /nonfatal "qtox\sqldrivers\*.*" - ${SetOutPath} "$INSTDIR\bin" # Create shortcuts ${CreateDirectory} "$SMPROGRAMS\qTox"