chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-14 09:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work around a Qt bug on Fedora 35 that caused hangs when selecting files.

Browse Source 
This disables the shift-key check at launch on Linux, but Linux users
can use --legacy if the functionality turns out to be relevant for Linux.
This commit is contained in:
sawinglogz 2022-01-14 11:45:54 -05:00
parent 2470e55b29
commit d44b51f245
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Htmldocs/release_notes.html
View File

@ -16,6 +16,7 @@
<i>The OSCAR Team</i></p> <i>The OSCAR Team</i></p>
<ul> <ul>
<li>[fix] Add footer to first page of printed Statistics report.</li> <li>[fix] Add footer to first page of printed Statistics report.</li>
<li>[fix] Work around a Qt bug on Fedora 35 that caused hangs when selecting files.</li>
</ul> </ul>
<p> <p>
<b>Changes and fixes in OSCAR v1.3.1-beta-2</b> <b>Changes and fixes in OSCAR v1.3.1-beta-2</b>

11
oscar/main.cpp
View File

@ -262,6 +262,13 @@ int main(int argc, char* argv[])
#else #else
#ifndef Q_OS_LINUX
// Due to a bug in Qt, creating multiple QApplication instances in a process
// causes subsequent native file dialog boxes to hang on Fedora 35.
// See https://bugreports.qt.io/browse/QTBUG-90616
//
// Since Linux users can simply use the --legacy command-line argument,
// we can remove the shift-key check that requires those multiple instances.
bool shiftKeyPressedAtLaunch(int argc, char *argv[]) bool shiftKeyPressedAtLaunch(int argc, char *argv[])
{ {
// Reliably detecting the shift key requires a QGuiApplication instance, but // Reliably detecting the shift key requires a QGuiApplication instance, but
@ -272,6 +279,7 @@ bool shiftKeyPressedAtLaunch(int argc, char *argv[])
delete app; delete app;
return keymodifier == Qt::ShiftModifier; return keymodifier == Qt::ShiftModifier;
} }
#endif
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -284,10 +292,13 @@ int main(int argc, char *argv[]) {
// If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX) // If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX)
QString forcedEngine = ""; QString forcedEngine = "";
#ifndef Q_OS_LINUX
// Shift key check is skipped on Linux due to a Qt bug, see comment at shiftKeyPressedAtLaunch().
if (shiftKeyPressedAtLaunch(argc, argv)){ if (shiftKeyPressedAtLaunch(argc, argv)){
settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software); settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
forcedEngine = "Software Engine forced by shift key at launch"; forcedEngine = "Software Engine forced by shift key at launch";
} }
#endif
// This argument needs to be processed before creating the QApplication, // This argument needs to be processed before creating the QApplication,
// based on sample code at https://doc.qt.io/qt-5/qapplication.html#details // based on sample code at https://doc.qt.io/qt-5/qapplication.html#details
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {