diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /src/widgets/widgets | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/widgets/qmacnativewidget_mac.mm | 5 | ||||
| -rw-r--r-- | src/widgets/widgets/qtoolbutton.cpp | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 2958d662c7..af085747ec 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1765,6 +1765,7 @@ void QComboBox::setLineEdit(QLineEdit *edit) delete d->lineEdit; d->lineEdit = edit; + qt_widget_private(d->lineEdit)->inheritsInputMethodHints = 1; if (d->lineEdit->parent() != this) d->lineEdit->setParent(this); connect(d->lineEdit, SIGNAL(returnPressed()), this, SLOT(_q_returnPressed())); diff --git a/src/widgets/widgets/qmacnativewidget_mac.mm b/src/widgets/widgets/qmacnativewidget_mac.mm index 7a7492e717..46a43c4110 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.mm +++ b/src/widgets/widgets/qmacnativewidget_mac.mm @@ -142,6 +142,11 @@ QSize QMacNativeWidget::sizeHint() const return QWidget::sizeHint(); } +/*! \fn NSView *QMacNativeWidget::nativeView() const + + Returns the native view backing the QMacNativeWidget. + +*/ NSView *QMacNativeWidget::nativeView() const { winId(); diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 93f0b60058..69432761e6 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -897,7 +897,12 @@ void QToolButton::setDefaultAction(QAction *action) return; if (!actions().contains(action)) addAction(action); - setText(action->text()); + QString buttonText = action->iconText(); + // If iconText() is generated from text(), we need to escape any '&'s so they + // don't turn into shortcuts + if (QActionPrivate::get(action)->iconText.isEmpty()) + buttonText.replace(QLatin1String("&"), QLatin1String("&&")); + setText(buttonText); setIcon(action->icon()); #ifndef QT_NO_TOOLTIP setToolTip(action->toolTip()); |