iOS, QComboBox: don't apply special case for OS X on iOS
authorRichard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Mon, 24 Nov 2014 15:44:31 +0000 (16:44 +0100)
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>
Wed, 26 Nov 2014 09:47:13 +0000 (10:47 +0100)
The special-case that was added for OS X before the iOS port
came to be stops the virtual keyboard from working correctly.

Task-number: QTBUG-41613
Change-Id: I0b8c83e98584389ea4a8aada16a1ee1a64300400
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
src/widgets/widgets/qcombobox.cpp

index fda37c49de1ba0e66221164bd14b7c8c4fbd35c8..40cf2f0f955a674d4e6469aa310e8b792a7c3071 100644 (file)
@@ -942,8 +942,8 @@ QComboBox::QComboBox(QComboBoxPrivate &dd, QWidget *parent)
 void QComboBoxPrivate::init()
 {
     Q_Q(QComboBox);
-#ifdef Q_OS_MAC
-    // On Mac, only line edits and list views always get tab focus. It's only
+#ifdef Q_OS_OSX
+    // On OS X, only line edits and list views always get tab focus. It's only
     // when we enable full keyboard access that other controls can get tab focus.
     // When it's not editable, a combobox looks like a button, and it behaves as
     // such in this respect.