Feature/qt4 qt5 #80
Open
Feature/qt4 qt5 #80
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
Remove remaining dependencies to qt4
…s part of the exported include path
Need to remove the prefixes
This avoids doing unnecessary work and prevents osgViz from trying to swap buffers on an unmapped window. This methods falls flat once more than one Vizkit3DWidget gets instanciated, but that seems to be not handled correctly in any case: The update frequency multiplies by the number of Vizkit3DWidgets, because osgviz always updates all windows.
Instead, move the bits we actually use(not much) into Vizkit3DWidget. This allows to call osgViewer::CompositeViewer::frame() only when the widget actually is visible. Calling frame() while invisible makes QOpenGLContext::swapBuffers() warn about being called with a non-exposed window.
This reverts commit 6af0401.
This reverts commit 6af0401.
Revert "openscenegraph-osgQt renamed to openscenegraph-osgQt5"
… into feature/qt5
Also makes the plugin information visible
Make Qts moc look at the headers needing MOCing
Because that way, they get installed.
…n PropertyBrowserWidget
fix: catch segmentation failed, if string property can not be set
Because that way, they get installed.
Custom gui
Sometimes devs might want to switch the visualization root to another frame, e.g. switch from odometry to slam this is now possible
make the root of the transformer display selectable
…o be able to find it" This reverts commit 3c803f1.
This allows rocks cmake macros to populate the pkgconfig .pc file with the include and library from QtPropertyBrowser.
…into feature/qt4-qt5
Sadly, the Q_EXPORT_PLUGIN2(FactoryClass, FactoryClass) cannot go into the header, while the class declaration must be in the header. Use the opportunity to separate the function implementation into the source file.
For qt4, it keeps looking for lib*-viz.().
This was removed on the qt5 branch for some reason. No ill effects were observed, and now, the camera is usable from the start.
This allows building on systems that lack either qt version.
renaming osg_qt4 is still to do.
The qt4 variant does cope with qtpropertybrowser not being installed, but it prefers the externally built variant.
This was broken in 53b00e8 and there already are comments that say that Q_OBJECT cannot be used there.
|
There are some last minute changes that i'd like to circulate a bit longer still. These have been found in a workspace that has no qt5 enabled packages but this and its dependencies. We have been running CI on ubuntu 22.04 with qt5 for a while now, and there seem to be very few failures to resolve on that side. As public repositories go, i think only vizkit3d_debug_drawings will need a few more changes to properly keep the qt dependencies out of components on the qt4-qt5 branch. |
planthaber
approved these changes
Feb 25, 2025
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.
This makes the vizkit3d-qt5 library available on systems having the required qt5 prerequisites. Qt4 using packages should (and have been tested to) be unaffected.