From b54eb9b841431fe8ec20c54c4b6f9ff19831a2eb Mon Sep 17 00:00:00 2001 From: Yikun Liu Date: Tue, 1 Aug 2023 22:19:11 +0800 Subject: [PATCH] Update linux dependencies --- CMakeLists.txt | 1 + README.md | 2 +- debian/control | 4 ++-- src/CMakeLists.txt | 3 +++ src/mpvObject.cpp | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dea9dc..1529644 100644 --- 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 index 5b15b2e..3b71ab7 100644 --- 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 index 305b9a8..805aa26 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: extra Maintainer: YK Liu 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 @@ -11,5 +11,5 @@ Homepage: https://github.com/coslyk/moonplayer 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 index 08733cc..307b695 100644 --- 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 index 7a2db4d..35b2adc 100644 --- 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();