diff options
| author | Pierre Rossi <pierre.rossi@nokia.com> | 2010-03-18 21:13:30 (GMT) |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@nokia.com> | 2010-03-31 14:33:21 (GMT) |
| commit | 33a2afa8cccc38302539573f8d3559976bf4cc91 (patch) | |
| tree | 47fad6f37be0650d5f68b5f9a100052c92ffee77 /src/gui/text/qtextcontrol.cpp | |
| parent | a0df2ac07c75882618b40657e1485dda3204880e (diff) | |
| download | Qt-33a2afa8cccc38302539573f8d3559976bf4cc91.zip Qt-33a2afa8cccc38302539573f8d3559976bf4cc91.tar.gz Qt-33a2afa8cccc38302539573f8d3559976bf4cc91.tar.bz2 | |
Remove the "Insert unicode control character" menu entry on X11.
It's still displayed when it seems to make sense with respect to
the active keyboard layouts. It can also be enabled from qtconfig.
Task-number: QTBUG-9186
Reviewed-by: Denis
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 6864fe1..671dfc0 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_CONTEXTMENU -#if defined(Q_WS_WIN) +#if defined(Q_WS_WIN) || defined(Q_WS_X11) extern bool qt_use_rtl_extensions; #endif #endif @@ -2080,7 +2080,7 @@ QMenu *QTextControl::createStandardContextMenu(const QPointF &pos, QWidget *pare } #endif -#if defined(Q_WS_WIN) +#if defined(Q_WS_WIN) || defined(Q_WS_X11) if ((d->interactionFlags & Qt::TextEditable) && qt_use_rtl_extensions) { #else if (d->interactionFlags & Qt::TextEditable) { |