Merge pull request #3411 from ann0see/iOS/FixLangBox

ann0see · web-flow · commit 18285f9fca0e · 2024-10-14T19:47:42.000+02:00
diff --git a/src/util.cpp b/src/util.cpp
@@ -642,7 +642,12 @@ CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&
 // Language combo box ----------------------------------------------------------
 CLanguageComboBox::CLanguageComboBox ( QWidget* parent ) : QComboBox ( parent ), iIdxSelectedLanguage ( INVALID_INDEX )
 {
-    QObject::connect ( this, static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ), this, &CLanguageComboBox::OnLanguageActivated );
+    // This requires a Qt::QueuedConnection on iOS due to https://bugreports.qt.io/browse/QTBUG-64577
+    QObject::connect ( this,
+                       static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),
+                       this,
+                       &CLanguageComboBox::OnLanguageActivated,
+                       Qt::QueuedConnection );
 }
 
 void CLanguageComboBox::Init ( QString& strSelLanguage )

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,12 @@ CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&`
`642`	`642`	`// Language combo box ----------------------------------------------------------`
`643`	`643`	`CLanguageComboBox::CLanguageComboBox ( QWidget* parent ) : QComboBox ( parent ), iIdxSelectedLanguage ( INVALID_INDEX )`
`644`	`644`	`{`
`645`		`- QObject::connect ( this, static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ), this, &CLanguageComboBox::OnLanguageActivated );`
	`645`	`+ // This requires a Qt::QueuedConnection on iOS due to https://bugreports.qt.io/browse/QTBUG-64577`
	`646`	`+ QObject::connect ( this,`
	`647`	`+ static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),`
	`648`	`+ this,`
	`649`	`+ &CLanguageComboBox::OnLanguageActivated,`
	`650`	`+ Qt::QueuedConnection );`
`646`	`651`	`}`
`647`	`652`
`648`	`653`	`void CLanguageComboBox::Init ( QString& strSelLanguage )`