Skip to content

Minor Changes necessary for QT6 that are compatible with QT5#214

Merged
atsju merged 3 commits into
githubdoe:masterfrom
atsju:JST/QT6retro
Jul 30, 2025
Merged

Minor Changes necessary for QT6 that are compatible with QT5#214
atsju merged 3 commits into
githubdoe:masterfrom
atsju:JST/QT6retro

Conversation

@atsju

@atsju atsju commented Jul 27, 2025

Copy link
Copy Markdown
Collaborator

As mentioned in #191 QT5 support is slowly falling appart.

However I don't want to break development flow for Dale. So here is a set of changes that are compatible with QT5.
I want to integrate them now, so the futur move to QT6 is easier and I can maintain the QT6 branch on my side until we decide to move.

@gr5 there is one change related to OpenCV that I only tested with CV 4.6.0. However Dale is building with CV 3.4.12. Could you test if this compiles as I suppose you already have this version available ?

@atsju atsju requested review from githubdoe and gr5 July 27, 2025 07:59
Comment thread camwizardpage1.cpp
@atsju atsju mentioned this pull request Jul 27, 2025
Comment thread contourrulerparams.cpp
Comment thread generatetargetdlg.cpp
@gr5

gr5 commented Jul 28, 2025

Copy link
Copy Markdown
Collaborator

oops! Please don't merge yet. The only thing remaining that I'm worried about is the "even number" issue.

Comment thread generatetargetdlg.cpp
@gr5

gr5 commented Jul 28, 2025

Copy link
Copy Markdown
Collaborator

I think this is fine to merge now.

@atsju

atsju commented Jul 30, 2025

Copy link
Copy Markdown
Collaborator Author

@githubdoe Do you have any remark on this one ?

In #206 (zernike) you clearly expressed you want to think about the changes and I'm fine with that.
However, it's unclear for me if you want to review each PR like this one (#214) yourself or not. Kindly let me now and I will comply :)

@githubdoe

Copy link
Copy Markdown
Owner

Yes I think I want to review them. However I don't have a lot of time to do it as I would like.

@atsju atsju merged commit 0c7bf0d into githubdoe:master Jul 30, 2025
8 checks passed
@atsju atsju deleted the JST/QT6retro branch July 30, 2025 17:22
@atsju atsju mentioned this pull request Aug 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants