diff --git a/.gitignore b/.gitignore index a0d1593e..223fa485 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,7 @@ ui_*.h #linglong building dir linglong -build \ No newline at end of file +build + +# vscode +.vscode \ No newline at end of file diff --git a/debian/control b/debian/control index 4baad62f..df61b29b 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Build-Depends: libdtk6widget-dev [amd64 arm64 i386 loong64] | libdtkwidget-dev, libdtk6gui-dev [amd64 arm64 i386 loong64] | libdtkgui-dev, libdtk6core-dev [amd64 arm64 i386 loong64] | libdtkcore-dev, - libspectre-dev, libdjvulibre-dev, libtiff-dev, libjpeg-dev, diff --git a/debian/rules b/debian/rules index 5e477b6e..f64c1fff 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,9 @@ #!/usr/bin/make -f include /usr/share/dpkg/default.mk +# 有的Qt5环境需要设置环境变量,Qt6不需要 +export QT_SELECT=5 + # 检测当前安装的Qt版本,优先使用Qt6,否则使用Qt5 define detect_qt_version ifneq (,$(shell which qmake6 2>/dev/null)) diff --git a/deepin_reader.pro b/deepin_reader.pro index 5baafe60..21915e99 100644 --- a/deepin_reader.pro +++ b/deepin_reader.pro @@ -21,7 +21,7 @@ versionAtLeast(QT_VERSION, 6.0.0) { QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml # Qt5 specific configurations - PKGCONFIG += dtkwidget dframeworkdbus poppler-qt5 + PKGCONFIG += dtkwidget dframeworkdbus QMAKE_LRELEASE = lrelease diff --git a/reader/reader.pro b/reader/reader.pro index ce1d9c13..253e1d3a 100755 --- a/reader/reader.pro +++ b/reader/reader.pro @@ -15,7 +15,7 @@ equals(QT_MAJOR_VERSION, 6) { QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml # Qt5 specific configurations - PKGCONFIG += dtkwidget dframeworkdbus poppler-qt5 + PKGCONFIG += dtkwidget dframeworkdbus QMAKE_LRELEASE = lrelease } diff --git a/reader/src.pri b/reader/src.pri index cf5c210d..bed258ea 100644 --- a/reader/src.pri +++ b/reader/src.pri @@ -43,7 +43,7 @@ equals(QT_MAJOR_VERSION, 6) { QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml # Qt5 specific configurations - PKGCONFIG += dtkwidget dframeworkdbus poppler-qt5 + PKGCONFIG += dtkwidget dframeworkdbus QMAKE_LRELEASE = lrelease }