2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00

Disable Qt's integration mechanism on GTK-based DE to avoid early GTK loading

This also removes TDESKTOP_USE_GTK_FILE_DIALOG since it doesn't forces GTK dialog for anyone and there is no reason to leave it

TDESKTOP_DISABLE_GTK_INTEGRATION can be also tested via action now
This commit is contained in:
Ilya Fedin
2020-08-04 19:47:01 +04:00
committed by John Preston
parent 1de1747c38
commit 786bedf271
7 changed files with 21 additions and 31 deletions

View File

@@ -682,14 +682,6 @@ bool IsGtkIntegrationForced() {
return false;
}
bool UseGtkFileDialog() {
#ifdef TDESKTOP_USE_GTK_FILE_DIALOG
return true;
#else // TDESKTOP_USE_GTK_FILE_DIALOG
return false;
#endif // !TDESKTOP_USE_GTK_FILE_DIALOG
}
bool IsQtPluginsBundled() {
#ifdef DESKTOP_APP_USE_PACKAGED_LAZY
return true;
@@ -1210,6 +1202,11 @@ void start() {
qunsetenv("QT_QPA_PLATFORMTHEME");
qunsetenv("QT_STYLE_OVERRIDE");
// Don't allow qgtk3 to init gtk earlier than us
if (DesktopEnvironment::IsGtkBased()) {
QApplication::setDesktopSettingsAware(false);
}
}
if (!UseGtkIntegration()) {
@@ -1241,10 +1238,10 @@ void start() {
if((IsStaticBinary()
|| InAppImage()
|| InSnap()
|| UseGtkFileDialog()
|| IsQtPluginsBundled())
&& !InFlatpak()) {
// it is handled by Qt for flatpak and snap
&& !InFlatpak()
&& !InSnap()) {
LOG(("Checking for XDG Desktop Portal..."));
// this can give us a chance to use
// a proper file dialog for current session