2 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm
index ae3a84ce67..b9c77e9bba 100644
--- a/src/plugins/platforms/ios/qiosscreen.mm
+++ b/src/plugins/platforms/ios/qiosscreen.mm
@@ -261,8 +261,11 @@ void QIOSScreen::updateProperties()
     QRect previousAvailableGeometry = m_availableGeometry;
 
     m_geometry = QRectF::fromCGRect(m_uiScreen.bounds).toRect();
-    m_availableGeometry = QSysInfo::MacintoshVersion & QSysInfo::MV_IOS ?
-        QRectF::fromCGRect(m_uiScreen.applicationFrame).toRect() : m_geometry;
+#ifdef Q_OS_TVOS
+    m_availableGeometry = m_geometry;
+#else
+    m_availableGeometry = QRectF::fromCGRect(m_uiScreen.applicationFrame).toRect();
+#endif
 
 #ifndef Q_OS_TVOS
     if (m_uiScreen == [UIScreen mainScreen]) {
diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
index a21b4d8a65..fa92e49673 100644
--- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
@@ -215,8 +215,10 @@ QColor QGtk3ColorDialogHelper::currentColor() const
 
 void QGtk3ColorDialogHelper::onAccepted()
 {
+    const QColor color = currentColor();
+    emit currentColorChanged(color);
     emit accept();
-    emit colorSelected(currentColor());
+    emit colorSelected(color);
 }
 
 void QGtk3ColorDialogHelper::onColorChanged(QGtk3ColorDialogHelper *dialog)
@@ -586,9 +588,10 @@ QFont QGtk3FontDialogHelper::currentFont() const
 
 void QGtk3FontDialogHelper::onAccepted()
 {
-    emit currentFontChanged(currentFont());
+    const QFont font = currentFont();
+    emit currentFontChanged(font);
     emit accept();
-    emit fontSelected(currentFont());
+    emit fontSelected(font);
 }
 
 void QGtk3FontDialogHelper::applyOptions()