diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-16 12:25:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 14:22:55 +0200 |
| commit | a51f37a43070160c2fe45555f8f42e1e16f06111 (patch) | |
| tree | db3f628868fca8c6aebcae26871f3abfb3568d53 | |
| parent | 0518a569c76cd97dc0e97d6773ccc1f62924a4a1 (diff) | |
Replace some Q_WS_X11 by check for platform's name.
Change-Id: I33d7ce31e01c355e0d9e05c98d6a84ea4f6d5bbd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | src/widgets/widgets/qabstractspinbox.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/widgets/qwidgetresizehandler.cpp | 14 | ||||
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 3 |
3 files changed, 10 insertions, 15 deletions
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 4d55c9f0af..25e2fc0eeb 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -62,9 +62,6 @@ # include <qaccessible.h> #endif -#if defined(Q_WS_X11) -#include <limits.h> -#endif //#define QABSTRACTSPINBOX_QSBDEBUG #ifdef QABSTRACTSPINBOX_QSBDEBUG @@ -1014,16 +1011,15 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event) return; #endif -#ifdef Q_WS_X11 // only X11 case Qt::Key_U: - if (event->modifiers() & Qt::ControlModifier) { + if (event->modifiers() & Qt::ControlModifier + && QGuiApplication::platformName() == QLatin1String("xcb")) { // only X11 event->accept(); if (!isReadOnly()) clear(); return; } break; -#endif case Qt::Key_End: case Qt::Key_Home: diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp index 0847263645..b8af977398 100644 --- a/src/widgets/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/widgets/qwidgetresizehandler.cpp @@ -253,14 +253,14 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e) QPoint p = globalPos + invertedMoveOffset; QPoint pp = globalPos - moveOffset; -#ifdef Q_WS_X11 // Workaround for window managers which refuse to move a tool window partially offscreen. - QRect desktop = QApplication::desktop()->availableGeometry(widget); - pp.rx() = qMax(pp.x(), desktop.left()); - pp.ry() = qMax(pp.y(), desktop.top()); - p.rx() = qMin(p.x(), desktop.right()); - p.ry() = qMin(p.y(), desktop.bottom()); -#endif + if (QGuiApplication::platformName() == QLatin1String("xcb")) { + const QRect desktop = QApplication::desktop()->availableGeometry(widget); + pp.rx() = qMax(pp.x(), desktop.left()); + pp.ry() = qMax(pp.y(), desktop.top()); + p.rx() = qMin(p.x(), desktop.right()); + p.ry() = qMin(p.y(), desktop.bottom()); + } QSize ms = qSmartMinSize(childWidget); int mw = ms.width(); diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index b21d7b837e..d1ac8d3734 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1271,10 +1271,9 @@ void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e) } else if (e == QKeySequence::Paste) { QClipboard::Mode mode = QClipboard::Clipboard; -#ifdef Q_WS_X11 + if (QGuiApplication::platformName() == QLatin1String("xcb")) if (e->modifiers() == (Qt::CTRL | Qt::SHIFT) && e->key() == Qt::Key_Insert) mode = QClipboard::Selection; -#endif q->paste(mode); } #endif |