Add Qt5 support #417
Merged
Add Qt5 support #417
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
mainegra
previously approved these changes
Mar 14, 2018
|
One testing question. Have we tested if the installer breaks if it's rerun overtop of an existing installation after switching QT versions? I only ask because 2018 seems to be the year of QT4's depreciation. |
|
@crcrewso no that shouldn't be a problem, I switched back and forth a number of times using an existing installation while testing the GUIs. |
Update egs_view, egs_configure, egs_gui, and egs_inprz to compile and run according to the official Qt4 to Qt5 migration documentation. This update has been tested under the Ubuntu distributed Qt libraries in 14.04 and 16.04. It has not been tested against static libraries.
Check the Qt version at compile time and use the corresponding functions or libraries. Tested with qt-4.8.6 and qt-5.10.1.
Remove combobox tooltips that are no longer used in the egs_inprz gui. These caused a visual bug on Windows systems when compiled with Qt5.
ftessier
force-pushed
the
add-qt5-support
branch
from
bc9599f
to
78bd73f
Compare
mainegra
approved these changes
Apr 10, 2018
ftessier
approved these changes
Apr 10, 2018
blakewalters
approved these changes
Apr 10, 2018
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 replaces PR #263.
Adds compatibility with Qt5 to the Qt GUIs. Adds compile-time checks for the Qt version so that the correct functions or libraries are used; i.e. the GUIs are still compatible with Qt4.
Also removes some old tooltip code in egs_inprz that was not used any more, but that caused a visual bug on Windows with Qt5 (the word "toolTipTip" appeared in the centre of the GUI).
Tested on qt-4.8.6 and qt-5.10.1 on linux and qt-5.10.1 on Windows.