diff options
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qdesktopwidget.qdoc | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qproxystyle.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qwidgetlinecontrol.cpp | 22 |
5 files changed, 12 insertions, 20 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 3f214809b4..dba3e8a97d 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -2437,7 +2437,7 @@ QWizardPage *QWizard::currentPage() const By default, this property has a value of -1, indicating that no page is currently shown. - \sa currentIdChanged(), currentPage() + \sa currentPage() */ int QWizard::currentId() const { diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc index 789a812afb..e8bda3c805 100644 --- a/src/widgets/kernel/qdesktopwidget.qdoc +++ b/src/widgets/kernel/qdesktopwidget.qdoc @@ -239,8 +239,6 @@ \brief the number of screens currently available on the system. \since 4.6 - - \sa screenCountChanged() */ /*! diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 76c4cbcb97..02d95d2fa5 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5519,7 +5519,7 @@ void QWidget::unsetLocale() On some desktop platforms (including Windows and Unix), the application name (from QGuiApplication::applicationDisplayName) is added at the end of the window title, if set. This is done by the QPA plugin, so it is shown to the - user, but isn't part of the \l windowTitle string. + user, but isn't part of the windowTitle string. \sa windowIcon, windowIconText, windowModified, windowFilePath */ diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp index b63e820bb9..eeed1a532b 100644 --- a/src/widgets/styles/qproxystyle.cpp +++ b/src/widgets/styles/qproxystyle.cpp @@ -109,7 +109,7 @@ void QProxyStylePrivate::ensureBaseStyle() const /*! Constructs a QProxyStyle object for overriding behavior in the - specified base \a style, or in the current \l{QApplication::style} + specified base \a style, or in the current \l{QApplication::style()} {application style} if base \a style is not specified. Ownership of \a style is transferred to QProxyStyle. @@ -128,7 +128,7 @@ QProxyStyle::QProxyStyle(QStyle *style) : /*! Constructs a QProxyStyle object for overriding behavior in the base style specified by style \a key, or in the current - \l{QApplication::style}{application style} if the specified + \l{QApplication::style()}{application style} if the specified style \a key is unrecognized. \sa QStyleFactory::create() diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index d10001a305..27048c1440 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -1773,6 +1773,14 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event) cursorWordBackward(true); del(); } + } else if (event == QKeySequence::DeleteCompleteLine) { + if (!isReadOnly()) { + setSelection(0, text().size()); +#ifndef QT_NO_CLIPBOARD + copy(); +#endif + del(); + } } #endif // QT_NO_SHORTCUT else { @@ -1810,20 +1818,6 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event) complete(event->key()); break; #endif - case Qt::Key_E: - if (m_keyboardScheme == QPlatformTheme::X11KeyboardScheme) - end(0); - break; - - case Qt::Key_U: - if (m_keyboardScheme == QPlatformTheme::X11KeyboardScheme && !isReadOnly()) { - setSelection(0, text().size()); -#ifndef QT_NO_CLIPBOARD - copy(); -#endif - del(); - } - break; default: if (!handled) unknown = true; |