From 471f6b9f32d5ead9e9c03544c1903fb38a1ef957 Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Sun, 28 Apr 2024 00:12:44 +0800 Subject: [PATCH] chore: update README and project file tweaks --- CMakeLists.txt | 2 +- README.md | 2 +- README.zh_CN.md | 2 +- pineapple-pictures.pro | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c7ad42..be233ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,7 +264,7 @@ elseif (APPLE) # ... elseif (UNIX) set (CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") - set (CPACK_DEBIAN_PACKAGE_SHILIBDEPS ON) + set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set (CPACK_DEBIAN_PACKAGE_RECOMMENDS "kimageformat-plugins") endif() diff --git a/README.md b/README.md index caf5afb..59a981b 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Pineapple Pictures is a lightweight image viewer that allows you view JPEG, PNG, Current state, we need: - `cmake`: as the build system. - - `qt5` with `qt5-svg` and `qt5-tools`: since the app is using Qt. + - `qt6` with `qt6-svg` and `qt6-tools`: since the app is using Qt. - `libexiv2`: able to display more image metadata. (optional, but recommended) Then we can build it with any proper c++ compiler like g++ or msvc. diff --git a/README.zh_CN.md b/README.zh_CN.md index b5c4a83..d3e56a1 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -36,7 +36,7 @@ 当前状态,我们需要先确保如下依赖可用: - `cmake`: 我们所使用的构建系统 - - 包含 `qt5-svg` 与 `qt5-tools` 组件的 `qt5`: 此应用基于 Qt + - 包含 `qt6-svg` 与 `qt6-tools` 组件的 `qt6`: 此应用基于 Qt - `libexiv2`: 用以获取和显示更多的图像元信息(可选,推荐) 然后我们就可以使用任何常规的 c++ 编译器如 g++ 或 msvc 来进行构建了 diff --git a/pineapple-pictures.pro b/pineapple-pictures.pro index cd08547..1812fbd 100644 --- a/pineapple-pictures.pro +++ b/pineapple-pictures.pro @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 Gary Wang +# SPDX-FileCopyrightText: 2024 Gary Wang # # SPDX-License-Identifier: MIT @@ -19,7 +19,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -CONFIG += c++11 lrelease embed_translations +CONFIG += c++17 lrelease embed_translations SOURCES += \ app/aboutdialog.cpp \ @@ -85,7 +85,7 @@ RC_ICONS = assets/icons/app-icon.ico # Windows only, for rc file (we're not going to use the .rc file in this repo) QMAKE_TARGET_PRODUCT = Pineapple Pictures QMAKE_TARGET_DESCRIPTION = Pineapple Pictures - Image Viewer -QMAKE_TARGET_COPYRIGHT = MIT/Expat License - Copyright (C) 2020 Gary Wang +QMAKE_TARGET_COPYRIGHT = MIT/Expat License - Copyright (C) 2024 Gary Wang # MSVC only, since QMake doesn't have a CMAKE_CXX_STANDARD_LIBRARIES or cpp_winlibs similar thing win32-msvc* {