1 Star 0 Fork 13

华亚东/peony

forked from src-openEuler/peony 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0001-fix-compilation-errors.patch 7.10 KB
一键复制 编辑 原始数据 按行查看 历史
华亚东 提交于 2024-04-01 16:02 . update version to 4.0.0
From 644a822896a32ac6b117f19b52abc7a313f4282a Mon Sep 17 00:00:00 2001
From: huayadong <[email protected]>
Date: Tue, 7 May 2024 17:10:42 +0800
Subject: [PATCH] fix compilation errors
---
3rd-parties/SingleApplication/singleapplication.pri | 2 +-
.../file-operation/file-operation-test/file-operation-test.pro | 2 +-
libpeony-qt/libpeony-qt.pro | 2 +-
libpeony-qt/model/model-test/model-test.pro | 2 +-
libpeony-qt/test/test.pro | 2 +-
peony-qt-desktop/peony-qt-desktop.pro | 2 +-
.../directory-view-extensions-plugin-test.pro | 2 +-
.../gtk2-style-enhanced-plugin/gtk2-style-enhanced-plugin.pro | 2 +-
.../peony-qt-menu-plugin-mate-terminal.pro | 2 +-
src/src.pro | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/3rd-parties/SingleApplication/singleapplication.pri b/3rd-parties/SingleApplication/singleapplication.pri
index 26f5c9c..c374713 100644
--- a/3rd-parties/SingleApplication/singleapplication.pri
+++ b/3rd-parties/SingleApplication/singleapplication.pri
@@ -1,5 +1,5 @@
QT += core network
-CONFIG += c++11
+CONFIG += c++17
HEADERS += $$PWD/singleapplication.h \
$$PWD/singleapplication_p.h
diff --git a/libpeony-qt/file-operation/file-operation-test/file-operation-test.pro b/libpeony-qt/file-operation/file-operation-test/file-operation-test.pro
index 36f4299..7cf36e6 100644
--- a/libpeony-qt/file-operation/file-operation-test/file-operation-test.pro
+++ b/libpeony-qt/file-operation/file-operation-test/file-operation-test.pro
@@ -22,7 +22,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 += link_pkgconfig no_keywords c++11
+CONFIG += link_pkgconfig no_keywords c++17
PKGCONFIG += glib-2.0 gio-2.0
include(../file-operation.pri)
diff --git a/libpeony-qt/libpeony-qt.pro b/libpeony-qt/libpeony-qt.pro
index 947b28c..dfcee56 100644
--- a/libpeony-qt/libpeony-qt.pro
+++ b/libpeony-qt/libpeony-qt.pro
@@ -14,7 +14,7 @@ TARGET = peony
TEMPLATE = lib
CONFIG += create_pc create_prl no_install_prl
QMAKE_CXXFLAGS += -Werror=return-type -Werror=return-local-addr -Werror=uninitialized -Werror=unused-label
-CONFIG += link_pkgconfig no_keywords c++11 lrelease hide_symbols
+CONFIG += link_pkgconfig no_keywords c++17 lrelease hide_symbols
PKGCONFIG += glib-2.0 gio-2.0 gio-unix-2.0 poppler-qt5 gsettings-qt udisks2 libnotify libcanberra openssl x11-xcb dconf
DEFINES += PEONYCORE_LIBRARY
diff --git a/libpeony-qt/model/model-test/model-test.pro b/libpeony-qt/model/model-test/model-test.pro
index 3ab15de..25ce68b 100644
--- a/libpeony-qt/model/model-test/model-test.pro
+++ b/libpeony-qt/model/model-test/model-test.pro
@@ -22,7 +22,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 += link_pkgconfig no_keywords c++11
+CONFIG += link_pkgconfig no_keywords c++17
PKGCONFIG += glib-2.0 gio-2.0
include(../../libpeony-qt.pri)
diff --git a/libpeony-qt/test/test.pro b/libpeony-qt/test/test.pro
index 97096db..30052d8 100644
--- a/libpeony-qt/test/test.pro
+++ b/libpeony-qt/test/test.pro
@@ -13,7 +13,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = peony-qt-core-test
TEMPLATE = app
-CONFIG += link_pkgconfig no_keywords c++11
+CONFIG += link_pkgconfig no_keywords c++17
PKGCONFIG += glib-2.0 gio-2.0
# The following define makes your compiler emit warnings if you use
diff --git a/peony-qt-desktop/peony-qt-desktop.pro b/peony-qt-desktop/peony-qt-desktop.pro
index 613d0e0..4f59cbb 100644
--- a/peony-qt-desktop/peony-qt-desktop.pro
+++ b/peony-qt-desktop/peony-qt-desktop.pro
@@ -25,7 +25,7 @@ include(../3rd-parties/qtsingleapplication/qtsingleapplication.pri)
DEFINES += QAPPLICATION_CLASS=QApplication
PKGCONFIG +=gio-2.0 glib-2.0 gio-unix-2.0 gsettings-qt libcanberra wayland-client dconf
-CONFIG += c++11 link_pkgconfig no_keywords lrelease
+CONFIG += c++17 link_pkgconfig no_keywords lrelease
LIBS += -L$$PWD/../libpeony-qt/ -lpeony -lX11 -lukui-log4qt
diff --git a/peony-qt-plugin-test/directory-view-extensions-plugin-test/directory-view-extensions-plugin-test.pro b/peony-qt-plugin-test/directory-view-extensions-plugin-test/directory-view-extensions-plugin-test.pro
index 32a8454..b2ba846 100644
--- a/peony-qt-plugin-test/directory-view-extensions-plugin-test/directory-view-extensions-plugin-test.pro
+++ b/peony-qt-plugin-test/directory-view-extensions-plugin-test/directory-view-extensions-plugin-test.pro
@@ -25,7 +25,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
include(../../plugin-iface/plugin-iface.pri)
include(../../libpeony-qt/libpeony-qt-header.pri)
PKGCONFIG +=gio-2.0 glib-2.0 gio-unix-2.0
-CONFIG += c++11 link_pkgconfig no_keywords
+CONFIG += c++17 link_pkgconfig no_keywords
LIBS += -L$$PWD/../../libpeony-qt/ -lpeony-qt
SOURCES += \
diff --git a/peony-qt-plugin-test/gtk2-style-enhanced-plugin/gtk2-style-enhanced-plugin.pro b/peony-qt-plugin-test/gtk2-style-enhanced-plugin/gtk2-style-enhanced-plugin.pro
index db23657..25179ed 100644
--- a/peony-qt-plugin-test/gtk2-style-enhanced-plugin/gtk2-style-enhanced-plugin.pro
+++ b/peony-qt-plugin-test/gtk2-style-enhanced-plugin/gtk2-style-enhanced-plugin.pro
@@ -25,7 +25,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
include(../../plugin-iface/plugin-iface.pri)
include(../../libpeony-qt/libpeony-qt-header.pri)
PKGCONFIG +=gio-2.0 glib-2.0 gio-unix-2.0
-CONFIG += c++11 link_pkgconfig no_keywords
+CONFIG += c++17 link_pkgconfig no_keywords
LIBS += -L$$PWD/../../libpeony-qt/ -lpeony-qt
SOURCES += \
diff --git a/peony-qt-plugin-test/peony-qt-menu-plugin-mate-terminal/peony-qt-menu-plugin-mate-terminal.pro b/peony-qt-plugin-test/peony-qt-menu-plugin-mate-terminal/peony-qt-menu-plugin-mate-terminal.pro
index 4cc11f9..a1539d2 100644
--- a/peony-qt-plugin-test/peony-qt-menu-plugin-mate-terminal/peony-qt-menu-plugin-mate-terminal.pro
+++ b/peony-qt-plugin-test/peony-qt-menu-plugin-mate-terminal/peony-qt-menu-plugin-mate-terminal.pro
@@ -25,7 +25,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
include(../../plugin-iface/plugin-iface.pri)
include(../../libpeony-qt/libpeony-qt-header.pri)
PKGCONFIG +=gio-2.0 glib-2.0 gio-unix-2.0
-CONFIG += c++11 link_pkgconfig no_keywords lrelease
+CONFIG += c++17 link_pkgconfig no_keywords lrelease
LIBS += -L$$PWD/../../libpeony-qt/ -lpeony-qt
SOURCES += \
diff --git a/src/src.pro b/src/src.pro
index ec3547c..4364249 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,7 +23,7 @@ DEFINES += QAPPLICATION_CLASS=QApplication
PKGCONFIG +=gio-2.0 glib-2.0 gio-unix-2.0 gsettings-qt libcanberra libnotify udisks2 openssl dconf
LIBS +=-lgio-2.0 -lglib-2.0 -lX11 -lukui-log4qt
-CONFIG += c++11 link_pkgconfig no_keywords lrelease
+CONFIG += c++17 link_pkgconfig no_keywords lrelease
LIBS += -L$$PWD/../libpeony-qt/ -lpeony
--
2.33.0
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/hua_yadong/peony.git
[email protected]:hua_yadong/peony.git
hua_yadong
peony
peony
master

搜索帮助