Skip to content

fix: Update include paths for libimagevisualresult based on QT version #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzwind merged 2 commits into from
Apr 17, 2025
Merged

fix: Update include paths for libimagevisualresult based on QT version #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9dc5cc
fix: Update include paths for libimagevisualresult based on QT version
dengzhongyuan365-dev Apr 17, 2025
068ed8e
chore: Bump version to 6.5.18
dengzhongyuan365-dev Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arm64/linglong.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-camera (6.5.18) unstable; urgency=medium

* Update version to 6.5.18.

-- dengzhongyuan <dengzhongyuan@uniontech.com> Thu, 17 Apr 2025 13:41:30 +0800

deepin-camera (6.5.17) unstable; urgency=medium

* Update version to 6.5.17
Expand Down
2 changes: 1 addition & 1 deletion linglong.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion loong64/linglong.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 5 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
#endif

extern "C" {
#include <libimagevisualresult/visualresult.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <libimagevisualresult6/visualresult.h>
#else
#include <libimagevisualresult/visualresult.h>

Check warning on line 23 in src/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <libimagevisualresult/visualresult.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#endif
}

#include <DMainWindow>

Check warning on line 27 in src/main.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <DMainWindow> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <DWidgetUtil>
#include <DLog>
#if QT_VERSION_MAJOR <= 5
Expand Down
6 changes: 5 additions & 1 deletion src/src/filterpreviewbutton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@
#include "filterpreviewbutton.h"

extern "C" {
#include <libimagevisualresult/visualresult.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <libimagevisualresult6/visualresult.h>
#else
#include <libimagevisualresult/visualresult.h>

Check warning on line 12 in src/src/filterpreviewbutton.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <libimagevisualresult/visualresult.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#endif
}

#include <QPainter>

Check warning on line 16 in src/src/filterpreviewbutton.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QPainter> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QPainterPath>

#if QT_VERSION_MAJOR <= 5
Expand Down
6 changes: 5 additions & 1 deletion src/src/majorimageprocessingthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
#include "camera.h"

extern "C" {
#include <libimagevisualresult/visualresult.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <libimagevisualresult6/visualresult.h>
#else
#include <libimagevisualresult/visualresult.h>

Check warning on line 14 in src/src/majorimageprocessingthread.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <libimagevisualresult/visualresult.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#endif
}

#include <QFile>

Check warning on line 18 in src/src/majorimageprocessingthread.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QFile> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QDate>
#include <QDir>
#include <DSysInfo>
Expand Down
Loading