Update linux dependencies

coslyk · Aug 1, 2023 · b54eb9b · b54eb9b
1 parent 3f7781b
commit b54eb9b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,6 +41,7 @@ add_definitions(-DQT_NO_CAST_FROM_ASCII)
 fix_project_version()
 
 find_package(Qt6 REQUIRED COMPONENTS Gui Qml Quick OpenGL Network LinguistTools)
+find_package(Qt6Gui REQUIRED)
 find_package(MPV REQUIRED)
 
 add_subdirectory(3rdparty)

diff --git a/README.md b/README.md
@@ -74,11 +74,11 @@ For building:
     - libssl-dev
 For running:
     - ffmpeg
-    - qml6-module-qt-labs-folderlistmodel
     - qml6-module-qt-labs-settings
     - qml6-module-qtqml-workerscript
     - qml6-module-qtquick
     - qml6-module-qtquick-controls
+    - qml6-module-qtquick-dialogs
     - qml6-module-qtquick-layouts
     - qml6-module-qtquick-templates
     - qml6-module-qtquick-window

diff --git a/debian/control b/debian/control
@@ -3,13 +3,13 @@ Section: sound
 Priority: extra
 Maintainer: YK Liu <cos.lyk@gmail.com>
 Build-Depends: debhelper (>= 8.0.0),
- cmake, qt6-base-dev, qt6-base-private-dev, qt6-declarative-dev, qt6-declarative-private-dev, qt6-tools-dev, libmpv-dev, libcurl4-openssl-dev, libssl-dev
+ cmake, qt6-base-dev, qt6-base-private-dev, qt6-declarative-dev, qt6-tools-dev, libmpv-dev, libcurl4-openssl-dev, libssl-dev
 Standards-Version: 3.9.2
 Homepage: https://github.com/coslyk/moonplayer
 #Vcs-Git: git://git.debian.org/collab-maint/moonplayer.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/moonplayer.git;a=summary
 
 Package: moonplayer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ffmpeg, qml6-module-qt-labs-folderlistmodel, qml6-module-qt-labs-settings, qml6-module-qtqml-workerscript, qml6-module-qtquick, qml6-module-qtquick-controls, qml6-module-qtquick-layouts, qml6-module-qtquick-templates, qml6-module-qtquick-window
+Depends: ${shlibs:Depends}, ${misc:Depends}, ffmpeg, qml6-module-qtquick-dialogs, qml6-module-qt-labs-settings, qml6-module-qtqml-workerscript, qml6-module-qtquick, qml6-module-qtquick-controls, qml6-module-qtquick-layouts, qml6-module-qtquick-templates, qml6-module-qtquick-window
  Video player for playing and downloading online videos from youtube, bilibili etc.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,7 @@
 
+# Include Qt Gui private headers
+include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+
 # Include MPV
 include_directories(${MPV_INCLUDE_DIRS})
 

diff --git a/src/mpvObject.cpp b/src/mpvObject.cpp
@@ -215,7 +215,7 @@ void MpvObject::open(const QUrl& fileUrl, const QUrl& danmakuUrl, const QUrl& au
 
         // set proxy
         NetworkAccessManager::ProxyType proxyType = (NetworkAccessManager::ProxyType) settings.value("network/proxy_type").toInt();
-        bool proxyForParseOnly = settings.value(QStringLiteral("network/proxy_only_for_parsing", false)).toBool();
+        bool proxyForParseOnly = settings.value(QStringLiteral("network/proxy_only_for_parsing"), false).toBool();
         if (!proxyForParseOnly && proxyType == NetworkAccessManager::HTTP_PROXY)
         {
             QByteArray proxy = QByteArrayLiteral("http://") + settings.value("network/proxy").toByteArray();