-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Update Qt version to 5.15.2 #1882
Merged
Merged
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
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
January 27, 2023 16:17
33a28f0
to
b8ddb8b
Compare
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
2 times, most recently
from
February 3, 2023 09:24
6a30d5e
to
b895031
Compare
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
February 15, 2023 13:48
71412ae
to
92ad5a4
Compare
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
February 16, 2023 11:13
749f780
to
6faedf9
Compare
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
March 6, 2023 14:06
6faedf9
to
0112af3
Compare
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
April 25, 2023 16:45
0112af3
to
bec81c3
Compare
The upgrade concerns the following modules: - QtCharts - QtPositioning - QtLocation - QtGraphicalEffects - QtQml
Slots now need to be written as function; the previous syntax is deprecated.
Setting this variable allows to keep on using "GET" on local files with XMLHttpRequest.
This commit addresses warnings that were raised by QtCreator's linter: - IDs declared more than once - variables declared more than once in the same scope - type coercions - variables declared as "var" when their type is known - unclosed "case" in switch-case
By setting the height on the "onLoaded" event, no height update was possible unless the component was unloaded (which happens when "active" gets set to false) first and then reloaded (which happens when "active" gets set to true). If an attribute was to be hidden (by unchecking the "advanced attributes" checkbox, for example), its content was effectively hidden, but as its height was not being updated, a blank block remained in its place. Similarly, for attributes that are filled with a lot of content after being initialized (ChoiceParams, for example), the height was set once at the attribute's initialization but never updated afterwards.
Manually convert the QPalette object to a QML Palette manually. The conversion is not straight forward anymore, and not performing it leads to an incomplete alternate (light) palette. QML Palette in Qt 5.15 does not support yet disabled elements, the support will only be enabled with Qt 6.
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
July 4, 2023 10:06
bec81c3
to
ca1c23c
Compare
Qt installation within the dockers is directly handled with command-line parameters of the installer itself.
…ments Supporting the alternative palette (triggered with Ctrl+Shift+P) requires a manual conversion from the QPalette to the QML palette, which does not directly support disabled elements. Keeping the previous palette management will support disabled elements, but cause issues when switching to the alternative palette. Until both can be fully supported, the alternative palette is disabled.
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
July 4, 2023 10:10
ca1c23c
to
59a092f
Compare
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
July 5, 2023 11:46
62cede4
to
c0d80ed
Compare
`libassimpsceneimport.so` is missing from Qt 5.15.2 and must therefore be added manually. Without it, there will be no OBJ files support in the 3D Viewer.
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
July 5, 2023 11:49
c0d80ed
to
b07751d
Compare
Add direct download links for `assimpsceneimport.dll` and `libassimpsceneimport.so` and indications as to where to copy them to avoid errors related to a missing AssimpSceneParser plugin.
cbentejac
force-pushed
the
dev/qt5.15-migration
branch
from
July 7, 2023 15:34
b9a9320
to
1ac35c7
Compare
mugulmd
approved these changes
Jul 7, 2023
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.
Description
This PR updates the version of PySide2 required by Meshroom to 5.15.2.1 (with Qt 5.15.2 being the corresponding Qt release).
Meshroom can now be used with any Python version > 3.4 and < 3.11, as specified by PySide2 5.15.2.1.
Issues introduced by the change of PySide2 version have been fixed, all the used QML modules have been updated to their correct Qt 5.15-compatible versions, and all the QML syntax warnings have been fixed.
QtAliceVision and QmlAlembic, Meshroom's plugins, do not require any update but will need to be rebuilt with Qt 5.15.2 (instead of Qt 5.14.1) to be compatible.
Note: the AssimpSceneParser plugin is missing in the 5.15.2 release and needs to be added manually (see https://bugreports.qt.io/browse/QTBUG-88821). This will not affect release versions but should be taken into account when building Meshroom from source. The missing libraries can directly be downloaded from these links:
and then copied into PySide's installation folder, in
plugins/sceneparsers
.Features list
Implementation remarks