Skip to content
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

5 ➡️ 6 #331

Merged
merged 10 commits into from
Dec 7, 2021
Merged

5 ➡️ 6 #331

merged 10 commits into from
Dec 7, 2021

Conversation

jennuine
Copy link
Contributor

@jennuine jennuine commented Dec 7, 2021

➡️ Forward port

Port ign-gui5 to ign-gui6

Branch comparison: ign-gui6...ign-gui5

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

NickNair and others added 10 commits November 11, 2021 09:39
Signed-off-by: Nikhil Nair <nikhilnicky972@gmail.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
- Change binding of width property in delegate (see: https://stackoverflow.com/questions/63767669/parent-is-null-in-listview-delegate-after-upgrade-to-qt-5-15)
- Use scoped reference to model.display (see: https://forum.qt.io/topic/92085/using-qstringlistmodel-as-model-in-listview)

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
Signed-off-by: William Wedler <william.wedler@resquared.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
@jennuine jennuine requested a review from chapulina as a code owner December 7, 2021 02:19
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Dec 7, 2021
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The codecheck failure is already on ign-gui6. I'll open a PR fixing it.

@chapulina chapulina merged commit dc3c2ed into ign-gui6 Dec 7, 2021
@chapulina chapulina deleted the jennuine/5_to_6 branch December 7, 2021 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants