Update To QT6#7029
Open
TheForce172 wants to merge 35 commits into
Open
Conversation
87c7623 to
ca4ee28
Compare
ca4ee28 to
42fab93
Compare
5c9cf25 to
dc1f970
Compare
dc1f970 to
238fda5
Compare
BMagnu
reviewed
Jul 5, 2026
| connect(this, &FredApplication::initializeComplete, [this]() { _initializeEmitted = true; }); | ||
| // Run our shutdown code after closing last window, but before application quits. | ||
| //connect(qApp, &QApplication::lastWindowClosed, this, &FredApplication::shutdown); |
Member
There was a problem hiding this comment.
Is it fine that we aren't actually running the shutdown code? That seems less than ideal
Contributor
Author
There was a problem hiding this comment.
We do, shutdown is run in the close event on line 2198 of Fredview.cpp, We were having a conflict here with both FSO and QT trying to destroy the opengl context after the FredView window had closed where QT had already destroyed the context. This will need to be refactored if we add support for multiple fred windows which is seem was planed at one point?
BMagnu
approved these changes
Jul 5, 2026
238fda5 to
0d0af27
Compare
Move shutdown to run before Qt destroys the opengl context disconnect visibility changes as it accidently runs after windows destruction due to QT weirdness
With the new QtFRED help changes it gets the filename wrong, including the names of multiple files by mistake. This tweaks the find command to ignore those other files.
Use Qt deployment cmake script for all platforms. This uses the platform specific method where possible (windeployqt/macdeployqt) and a generic deployment script on other platforms. This also uses a crazy RPATH hack on Linux, which is necessary for it to find the prebuilt Qt libs and deploy them. Qt does not appear to allow passing tool options for the generic deployment script so we can't tell the relavent cmake functions where to look for our libraries even though they support such functionality.
1433420 to
bb81f70
Compare
This file contains hidden or 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
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.
Starts the process of updating us to QT6.
*Crash on close on windows (GLSync Error)Fixed*Segmentation Fault on Launch in Linux VMNot reproducble*Not a crash but this required fully rewriting the CMake file so more changes may me needed to that and possibly to workflows.Being handled in separate PR by taylorAlso this will require us to drop Windows 7 support as QT6 Does not support it.