StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(dependency): remove unused qt sql dependency

Browse Source 
fix #4567
This commit is contained in:
sudden6 2017-08-11 22:45:15 +02:00
parent 59229ff4af
commit 5d159e0203
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
6 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
INSTALL.md
View File

@ -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 \

2
cmake/Dependencies.cmake
View File

@ -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)

2
qtox.pro
View File

@ -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

4
simple_make.sh
View File

@ -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

5
windows/qtox.nsi
View File

@ -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"

5
windows/qtox64.nsi
View File

@ -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"