Skip to content

Update To QT6#7029

Open
TheForce172 wants to merge 35 commits into
scp-fs2open:masterfrom
TheForce172:QTFred/translate
Open

Update To QT6#7029
TheForce172 wants to merge 35 commits into
scp-fs2open:masterfrom
TheForce172:QTFred/translate

Conversation

@TheForce172

@TheForce172 TheForce172 commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

Starts the process of updating us to QT6.

*Crash on close on windows (GLSync Error) Fixed
*Segmentation Fault on Launch in Linux VM Not 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 taylor

Also this will require us to drop Windows 7 support as QT6 Does not support it.

@wookieejedi wookieejedi added the enhancement A new feature or upgrade of an existing feature to add additional functionality. label Sep 13, 2025
@BMagnu BMagnu added the Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle label May 31, 2026
@TheForce172 TheForce172 marked this pull request as ready for review July 4, 2026 16:54

@BMagnu BMagnu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

One question, otherwise LGTM conditional on it being rebased once #7562 is in, with Qt tests / builds reenabled.

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);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is it fine that we aren't actually running the shutdown code? That seems less than ideal

@TheForce172 TheForce172 Jul 5, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Gotcha, that's fine for now then

@BMagnu BMagnu removed the Waiting for Stable Marks a pull request that is to be merged after the next stable release, due to a release cycle label Jul 5, 2026
notimaginative and others added 18 commits July 5, 2026 18:01
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement A new feature or upgrade of an existing feature to add additional functionality.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants