COMP: Ensure DICOMWidget compatibility with Qt 5.12.8 #1200
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit resolves compilation issues encountered when building the DICOMWidget against Qt 5.12.8. The changes include: 1. Removed the setting of the unsupported and unused `placeholderText` property from `ctkDICOMVisualBrowserWidget.ui`. This property's removal does not affect widget rendering. The removal addresses a compilation error introduced in commit 88ff72b ("ENH: Add Visual DICOM Browser (commontk#1165)", 2024-01-19): ``` /path/to/CTK/Libs/DICOM/Core/ctkDICOMStorageListener.cpp:71:18: error: ‘acceptAssociations’ is not a member of ‘DcmSCP’ 71 | return DcmSCP::acceptAssociations(); | ^~~~~~~~~~~~~~~~~~ ``` 2. Introduced conditional utilization of `Qt::MatchRegularExpression`, available in Qt 5.15, to resolve a compilation error introduced in commit 888cdd9 ("ENH: Add ctkDICOMJobListWidget for logging jobs activity in the UI", 2024-01-18): ``` /path/to/CTK/Libs/DICOM/Widgets/ctkDICOMJobListWidget.cpp:405:69: error: ‘MatchRegularExpression’ is not a member of ‘Qt’ 405 | QList<QStandardItem*> list = this->findItems(tr("completed"), Qt::MatchRegularExpression, Columns::Status); | ^~~~~~~~~~~~~~~~~~~~~~ ```
This update to the GitHub workflow enables testing builds against Qt 5.12.8 on Ubuntu 20.04. Notably, the build excludes VTK due to unavailability of VTK 9 packages on Ubuntu 20.04. To support building ctkDICOMCore on Ubuntu 20.04, DCMTK is now built from source using the CTK SuperBuild. This decision stems from the absence of DCMTK 3.6.6, as indicated by the DCMTK package version 3.6.4 available[^1] via apt-get. The need for building DCMTK from source arises from the utilization of the function `DcmSCP::acceptAssociations`, introduced in DCMTK 3.6.6 through DCMTK/dcmtk@c3d4c8e09 (Added alternative service provision API to DcmSCP). Additionally, to ensure completion of the independent GitHub CI build workflows testing against Qt 5.15.2 and Qt 5.12.8, the "fail-fast" option is set to false. [^1]: https://packages.ubuntu.com/focal/dcmtk
jcfr
force-pushed
the
support-building-against-qt-5.12.8
branch
from
1ee10bf
to
4f03f5b
Compare
|
@jcfr thanks for this! I tested manually, and for me it is good to go! |
jamesobutler
approved these changes
Apr 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
COMP: Ensure DICOMWidget compatibility with Qt 5.12.8Resolves compilation issues encountered when building the DICOMWidget
against Qt 5.12.8. The changes include:
Removed the setting of the unsupported and unused
placeholderTextproperty fromctkDICOMVisualBrowserWidget.ui. This property's removal does not affect widget rendering. The removal addresses a compilation error introduced in commit 88ff72b ("ENH: Add Visual DICOM Browser", 2024-01-19):Introduced conditional utilization of
Qt::MatchRegularExpression, available in Qt 5.15, to resolve a compilation error introduced in commit 888cdd9 ("ENH: Add ctkDICOMJobListWidget for logging jobs activity in the UI", 2024-01-18):ENH: Update GitHub workflow to test build against Qt 5.12.8This update to the GitHub workflow enables testing builds against Qt 5.12.8 on Ubuntu 20.04. Notably, the build excludes VTK due to unavailability of VTK 9 packages on Ubuntu 20.04.
To support building ctkDICOMCore on Ubuntu 20.04, DCMTK is now built from source using the CTK SuperBuild. This decision stems from the absence of DCMTK 3.6.6, as indicated by the DCMTK package version 3.6.4 available1 via apt-get. The need for building DCMTK from source arises from the utilization of the function
DcmSCP::acceptAssociations, introduced in DCMTK 3.6.6 through DCMTK/dcmtk@c3d4c8e09 (Added alternative service provision API to DcmSCP).Additionally, to ensure completion of the independent GitHub CI build workflows testing against Qt 5.15.2 and Qt 5.12.8, the "fail-fast" option is set to false.
Related issues and pull request
cc: @Punzo
Footnotes
https://packages.ubuntu.com/focal/dcmtk ↩