diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-02-22 16:02:22 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-02-24 13:04:58 +0000 |
| commit | f0d51ae18393d4aa51ecd13a1c9353167177bea7 (patch) | |
| tree | 772948fcfd24e493ac8d4ba250143a0c81d21073 | |
| parent | 51240b75cc7ac4241e9d953ec8e794ce72f38ba4 (diff) | |
Port from QT_NO_CURSOR to QT_CONFIG(cursor)
Change-Id: If7dd96ed25b1183586b903503b160fdeaef1ccea
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/platform/qquickplatformmenu.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktextfield.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp index 62039922..34a114f5 100644 --- a/src/imports/platform/qquickplatformmenu.cpp +++ b/src/imports/platform/qquickplatformmenu.cpp @@ -691,7 +691,7 @@ void QQuickPlatformMenu::open(QQmlV4Function *args) QRectF sceneBounds = targetItem->mapRectToScene(targetItem->boundingRect()); targetRect = sceneBounds.toAlignedRect().translated(offset); } else { -#ifndef QT_NO_CURSOR +#if QT_CONFIG(cursor) QPoint pos = QCursor::pos(); if (window) pos = window->mapFromGlobal(pos); diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 235152a2..1eb11c66 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -105,7 +105,7 @@ QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) setVisible(false); setFlag(ItemIsFocusScope); setAcceptedMouseButtons(Qt::AllButtons); -#ifndef QT_NO_CURSOR +#if QT_CONFIG(cursor) setCursor(Qt::ArrowCursor); #endif diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index a4be1303..bc8dad8f 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -397,7 +397,7 @@ QQuickTextArea::QQuickTextArea(QQuickItem *parent) setAcceptedMouseButtons(Qt::AllButtons); d->setImplicitResizeEnabled(false); d->pressHandler.control = this; -#ifndef QT_NO_CURSOR +#if QT_CONFIG(cursor) setCursor(Qt::IBeamCursor); #endif QObjectPrivate::connect(this, &QQuickTextEdit::readOnlyChanged, diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index ec46b15c..9ea6e62d 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -271,7 +271,7 @@ QQuickTextField::QQuickTextField(QQuickItem *parent) d->setImplicitResizeEnabled(false); setAcceptedMouseButtons(Qt::AllButtons); setActiveFocusOnTab(true); -#ifndef QT_NO_CURSOR +#if QT_CONFIG(cursor) setCursor(Qt::IBeamCursor); #endif QObjectPrivate::connect(this, &QQuickTextInput::readOnlyChanged, d, &QQuickTextFieldPrivate::readOnlyChanged); |