diff options
| author | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2014-11-24 16:44:31 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-26 10:47:13 +0100 |
| commit | 89867f86fc5766c30253748560b8c16f721e808e (patch) | |
| tree | 1755801478c3153d7f38972c875f07fd2659ade8 /src | |
| parent | aed71b6832703e0c6cb953ac9a5cd7cfba95f7b5 (diff) | |
iOS, QComboBox: don't apply special case for OS X on iOS
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index fda37c49de..40cf2f0f95 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -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. |