diff --git a/arm64/linglong.yaml b/arm64/linglong.yaml index 21064f13..2bef3156 100644 --- a/arm64/linglong.yaml +++ b/arm64/linglong.yaml @@ -7,7 +7,7 @@ version: "1" package: id: org.deepin.camera name: "deepin-camera" - version: 6.5.17.1 + version: 6.5.18.1 kind: app description: | camera for deepin os. diff --git a/debian/changelog b/debian/changelog index d43ec26a..46e11695 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-camera (6.5.18) unstable; urgency=medium + + * Update version to 6.5.18. + + -- dengzhongyuan Thu, 17 Apr 2025 13:41:30 +0800 + deepin-camera (6.5.17) unstable; urgency=medium * Update version to 6.5.17 diff --git a/linglong.yaml b/linglong.yaml index 1ccd21c6..c65ed4a4 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -7,7 +7,7 @@ version: "1" package: id: org.deepin.camera name: "deepin-camera" - version: 6.5.17.1 + version: 6.5.18.1 kind: app description: | camera for deepin os. diff --git a/loong64/linglong.yaml b/loong64/linglong.yaml index 0dd4b4aa..6810f642 100755 --- a/loong64/linglong.yaml +++ b/loong64/linglong.yaml @@ -7,7 +7,7 @@ version: "1" package: id: org.deepin.camera name: "deepin-camera" - version: 6.5.17.1 + version: 6.5.18.1 kind: app description: | camera for deepin os. diff --git a/src/main.cpp b/src/main.cpp index 71e6f6ad..ba1aa4a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,11 @@ extern "C" { #endif extern "C" { -#include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + #include +#else + #include +#endif } #include diff --git a/src/src/filterpreviewbutton.cpp b/src/src/filterpreviewbutton.cpp index 16fd92a8..42a12fd5 100644 --- a/src/src/filterpreviewbutton.cpp +++ b/src/src/filterpreviewbutton.cpp @@ -6,7 +6,11 @@ #include "filterpreviewbutton.h" extern "C" { -#include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + #include +#else + #include +#endif } #include diff --git a/src/src/majorimageprocessingthread.cpp b/src/src/majorimageprocessingthread.cpp index 1eda9f20..dff4fda5 100644 --- a/src/src/majorimageprocessingthread.cpp +++ b/src/src/majorimageprocessingthread.cpp @@ -8,7 +8,11 @@ #include "camera.h" extern "C" { -#include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + #include +#else + #include +#endif } #include