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

[ign to gz] Deduplicate QML files #449

Merged
merged 3 commits into from
Aug 2, 2022
Merged

Conversation

chapulina
Copy link
Contributor

🦟 Bug fix

Summary

Here's a migration for the QML files which removes the duplicated ones. The trick is:

  • include/gz/gui/qml/qmldir_deprecated adds support for the ignition.gui deprecated module, so downstream QML files calling import ignition.gui 1.0 still work
  • The aliases added inside qmldir and qmldir_deprecated make sure that both Ign and Gz components are available even when importing either ignition.gui or gz.gui.

Test it

  • Build and run the gz_components example - this shows that both IgnSpinBox and GzSpinBox work with import gz.gui 1.0
  • Then change it to import ignition.gui 1.0 and check that this works too

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina added bug Something isn't working ign to gz Renaming Ignition to Gazebo labels Aug 1, 2022
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Aug 1, 2022
Signed-off-by: Louise Poubel <[email protected]>
Copy link
Contributor

@methylDragon methylDragon left a comment

Choose a reason for hiding this comment

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

LGTM on green CI, I'm not sure why CI isn't green though...

Also noting that this means the other Ign prefixed stuff won't work in downstream libs since the redirection aliases for them 💥 ?

(The Ign -> Gz aliases were in https://github.com/gazebosim/gz-gui/pull/449/files#diff-978089d7a839a8b0ec51044f445624a06765881a90adaa0e66a381d1326bcc3b , but now are gone)

@chapulina
Copy link
Contributor Author

I'm not sure why CI isn't green though...

the other Ign prefixed stuff won't work in downstream libs since the redirection aliases for them

Ah yeah, the ones outside of the module aren't meant to be used downstream, so that should be ok

@chapulina chapulina merged commit 17c7302 into main Aug 2, 2022
@chapulina chapulina deleted the chapulina/7/qml_deduplicate branch August 2, 2022 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working 🌱 garden Ignition Garden ign to gz Renaming Ignition to Gazebo
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants