diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-30 13:17:00 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-01 13:35:08 +0200 |
commit | 1259c5768e410361bcd8b5cf0c2057a2ebabda83 (patch) | |
tree | 4cb0444f1272506fd0cc788d45fccf601138ef72 /src/declarative/items | |
parent | e4ba808305952dd313b495f20300ec6e2c3801ac (diff) |
Remove the remaining dependencies onto QtWidgets
Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8
Reviewed-on: http://codereview.qt.nokia.com/3992
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/items')
-rw-r--r-- | src/declarative/items/context2d/qsgcontext2d.cpp | 11 | ||||
-rw-r--r-- | src/declarative/items/qsganimation.cpp | 1 | ||||
-rw-r--r-- | src/declarative/items/qsgcanvas.cpp | 8 | ||||
-rw-r--r-- | src/declarative/items/qsgcanvas.h | 2 | ||||
-rw-r--r-- | src/declarative/items/qsgcanvas_p.h | 2 | ||||
-rw-r--r-- | src/declarative/items/qsgflickable.cpp | 11 | ||||
-rw-r--r-- | src/declarative/items/qsgitem.cpp | 7 | ||||
-rw-r--r-- | src/declarative/items/qsgitem.h | 1 | ||||
-rw-r--r-- | src/declarative/items/qsgitemsmodule.cpp | 3 | ||||
-rw-r--r-- | src/declarative/items/qsgmousearea.cpp | 3 | ||||
-rw-r--r-- | src/declarative/items/qsgmousearea_p.h | 2 | ||||
-rw-r--r-- | src/declarative/items/qsgpainteditem.h | 1 | ||||
-rw-r--r-- | src/declarative/items/qsgpainteditem_p.h | 1 | ||||
-rw-r--r-- | src/declarative/items/qsgpathview.cpp | 5 | ||||
-rw-r--r-- | src/declarative/items/qsgpincharea.cpp | 5 | ||||
-rw-r--r-- | src/declarative/items/qsgtext.cpp | 4 | ||||
-rw-r--r-- | src/declarative/items/qsgtextedit.cpp | 12 | ||||
-rw-r--r-- | src/declarative/items/qsgtextedit_p_p.h | 1 | ||||
-rw-r--r-- | src/declarative/items/qsgtextinput.cpp | 24 | ||||
-rw-r--r-- | src/declarative/items/qsgtextnode_p.h | 2 |
20 files changed, 53 insertions, 53 deletions
diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp index 22a9c7029e..7a8465a4bc 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -47,9 +47,7 @@ #include <QtCore/qdebug.h> #include "private/qsgcontext_p.h" -#include <QtWidgets/qgraphicsitem.h> -#include <QtWidgets/qapplication.h> -#include <QtWidgets/qgraphicseffect.h> +#include <QtGui/qguiapplication.h> #include <qdeclarativeinfo.h> #include <QtCore/qmath.h> #include "qdeclarativepixmapcache_p.h" @@ -78,10 +76,6 @@ void copy_vector(QVector<T>* dst, const QVector<T>& src) } } -// Note, this is exported but in a private header as qtopengl depends on it. -// But it really should be considered private API -void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0); -void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0); static bool parsePathDataFast(const QString &dataStr, QPainterPath &path); #define DEGREES(t) ((t) * 180.0 / Q_PI) #define qClamp(val, min, max) qMin(qMax(val, min), max) @@ -1322,6 +1316,8 @@ QImage QSGContext2DPrivate::makeShadowImage(const QPixmap& pix) tmpPainter.drawPixmap(shadowX, shadowY, pix); tmpPainter.end(); +#if 0 + // ### refactor // blur the alpha channel if (state.shadowBlur > 0) { QImage blurred(shadowImg.size(), QImage::Format_ARGB32); @@ -1331,6 +1327,7 @@ QImage QSGContext2DPrivate::makeShadowImage(const QPixmap& pix) blurPainter.end(); shadowImg = blurred; } +#endif // blacken the image with shadow color... tmpPainter.begin(&shadowImg); diff --git a/src/declarative/items/qsganimation.cpp b/src/declarative/items/qsganimation.cpp index 446dc5a7c7..0822974397 100644 --- a/src/declarative/items/qsganimation.cpp +++ b/src/declarative/items/qsganimation.cpp @@ -47,6 +47,7 @@ #include <QtCore/qmath.h> #include <QtCore/qsequentialanimationgroup.h> #include <QtCore/qparallelanimationgroup.h> +#include <QtGui/qtransform.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp index f97028a3fc..96af2a5f3a 100644 --- a/src/declarative/items/qsgcanvas.cpp +++ b/src/declarative/items/qsgcanvas.cpp @@ -115,7 +115,7 @@ public: virtual void maybeUpdate() { if (!updatePending) { - QApplication::postEvent(this, new QEvent(QEvent::User)); + QCoreApplication::postEvent(this, new QEvent(QEvent::User)); updatePending = true; } } @@ -839,7 +839,7 @@ bool QSGCanvasPrivate::clearHover() bool accepted = false; foreach (QSGItem* item, hoverItems) - accepted = sendHoverEvent(QEvent::HoverLeave, item, pos, pos, QApplication::keyboardModifiers(), true) || accepted; + accepted = sendHoverEvent(QEvent::HoverLeave, item, pos, pos, QGuiApplication::keyboardModifiers(), true) || accepted; hoverItems.clear(); return accepted; } @@ -1888,7 +1888,7 @@ void QSGCanvasRenderThread::run() #ifdef THREAD_DEBUG printf(" RenderThread: aquired sync lock...\n"); #endif - QApplication::postEvent(this, new QEvent(QEvent::User)); + QCoreApplication::postEvent(this, new QEvent(QEvent::User)); #ifdef THREAD_DEBUG printf(" RenderThread: going to sleep...\n"); #endif @@ -2251,7 +2251,7 @@ QImage QSGCanvasRenderThread::grab() void QSGCanvasRenderThread::maybeUpdate() { - Q_ASSERT_X(QThread::currentThread() == QApplication::instance()->thread() || inSync, + Q_ASSERT_X(QThread::currentThread() == QCoreApplication::instance()->thread() || inSync, "QSGCanvas::update", "Function can only be called from GUI thread or during QSGItem::updatePaintNode()"); diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h index e364ee88f5..b396788e73 100644 --- a/src/declarative/items/qsgcanvas.h +++ b/src/declarative/items/qsgcanvas.h @@ -44,7 +44,7 @@ #include <QtCore/qmetatype.h> #include <QtGui/qopengl.h> -#include <QtWidgets/qwidget.h> +#include <QtGui/qwindow.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h index 6915bffa04..acd52a8a2a 100644 --- a/src/declarative/items/qsgcanvas_p.h +++ b/src/declarative/items/qsgcanvas_p.h @@ -63,11 +63,11 @@ #include <QtCore/qthread.h> #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> -#include <private/qwidget_p.h> #include <private/qwindow_p.h> #include <private/qopengl_p.h> #include <qopenglcontext.h> #include <QtGui/qopenglframebufferobject.h> +#include <QtGui/qevent.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index 92554f8e79..21474be8d9 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -46,7 +46,8 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtGui/qevent.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qstylehints.h> #include "qplatformdefs.h" QT_BEGIN_NAMESPACE @@ -821,7 +822,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) if (q->yflick()) { int dy = int(event->localPos().y() - pressPos.y()); - if (qAbs(dy) > QApplication::startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { + if (qAbs(dy) > qApp->styleHints()->startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { if (!vMoved) vData.dragStartOffset = dy; qreal newY = dy + vData.pressPos - vData.dragStartOffset; @@ -846,14 +847,14 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) vData.move.setValue(qRound(newY)); vMoved = true; } - if (qAbs(dy) > QApplication::startDragDistance()) + if (qAbs(dy) > qApp->styleHints()->startDragDistance()) stealY = true; } } if (q->xflick()) { int dx = int(event->localPos().x() - pressPos.x()); - if (qAbs(dx) > QApplication::startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { + if (qAbs(dx) > qApp->styleHints()->startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) { if (!hMoved) hData.dragStartOffset = dx; qreal newX = dx + hData.pressPos - hData.dragStartOffset; @@ -879,7 +880,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) hMoved = true; } - if (qAbs(dx) > QApplication::startDragDistance()) + if (qAbs(dx) > qApp->styleHints()->startDragDistance()) stealX = true; } } diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp index c7df26dc0c..765fe349ca 100644 --- a/src/declarative/items/qsgitem.cpp +++ b/src/declarative/items/qsgitem.cpp @@ -51,8 +51,8 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtWidgets/qgraphicstransform.h> #include <QtGui/qpen.h> +#include <QtGui/qcursor.h> #include <QtCore/qdebug.h> #include <QtCore/qcoreevent.h> #include <QtCore/qnumeric.h> @@ -2240,8 +2240,6 @@ void QSGItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObjec // This test is measurably (albeit only slightly) faster than qobject_cast<>() const QMetaObject *mo = o->metaObject(); while (mo && mo != &QSGItem::staticMetaObject) { - if (mo == &QGraphicsObject::staticMetaObject) - qWarning("Cannot add a QtQuick 1.0 item (%s) into a QtQuick 2.0 scene!", o->metaObject()->className()); mo = mo->d.superdata; } @@ -2249,6 +2247,9 @@ void QSGItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObjec QSGItem *item = static_cast<QSGItem *>(o); item->setParentItem(that); } else { + if (o->inherits("QGraphicsItem")) + qWarning("Cannot add a QtQuick 1.0 item (%s) into a QtQuick 2.0 scene!", o->metaObject()->className()); + // XXX todo - do we really want this behavior? o->setParent(that); } diff --git a/src/declarative/items/qsgitem.h b/src/declarative/items/qsgitem.h index bff32e3f65..9cd549d3b8 100644 --- a/src/declarative/items/qsgitem.h +++ b/src/declarative/items/qsgitem.h @@ -50,7 +50,6 @@ #include <QtCore/QList> #include <QtGui/qevent.h> #include <QtGui/qfont.h> -#include <QtWidgets/qaction.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp index 9547dc01cc..0d147d31fc 100644 --- a/src/declarative/items/qsgitemsmodule.cpp +++ b/src/declarative/items/qsgitemsmodule.cpp @@ -157,9 +157,6 @@ static void qt_sgitems_defineModule(const char *uri, int major, int minor) qmlRegisterType<QValidator>(); #endif qmlRegisterType<QSGVisualModel>(); -#ifndef QT_NO_ACTION - qmlRegisterType<QAction>(); -#endif qmlRegisterType<QSGPen>(); qmlRegisterType<QSGFlickableVisibleArea>(); qRegisterMetaType<QSGAnchorLine>("QSGAnchorLine"); diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index 547df313d2..cae0be60c5 100644 --- a/src/declarative/items/qsgmousearea.cpp +++ b/src/declarative/items/qsgmousearea.cpp @@ -47,6 +47,7 @@ #include <QtGui/qevent.h> #include <QtGui/qguiapplication.h> +#include <QtGui/qstylehints.h> #include <float.h> @@ -760,7 +761,7 @@ void QSGMouseArea::mouseMoveEvent(QMouseEvent *event) curLocalPos = event->windowPos(); } - const int dragThreshold = 20; // ### refactor: QGuiApplication::startDragDistance(); + const int dragThreshold = qApp->styleHints()->startDragDistance(); qreal dx = qAbs(curLocalPos.x() - startLocalPos.x()); qreal dy = qAbs(curLocalPos.y() - startLocalPos.y()); diff --git a/src/declarative/items/qsgmousearea_p.h b/src/declarative/items/qsgmousearea_p.h index c7d3cb79f1..0ec9c6b335 100644 --- a/src/declarative/items/qsgmousearea_p.h +++ b/src/declarative/items/qsgmousearea_p.h @@ -45,6 +45,8 @@ #include "qsgitem.h" +#include <QtCore/qstringlist.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgpainteditem.h b/src/declarative/items/qsgpainteditem.h index 3fc8fb890f..244e24b18c 100644 --- a/src/declarative/items/qsgpainteditem.h +++ b/src/declarative/items/qsgpainteditem.h @@ -43,6 +43,7 @@ #define QSGPAINTEDITEM_P_H #include <qsgitem.h> +#include <QtGui/qcolor.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qsgpainteditem_p.h index 87b9f6890d..3ad44660a1 100644 --- a/src/declarative/items/qsgpainteditem_p.h +++ b/src/declarative/items/qsgpainteditem_p.h @@ -44,6 +44,7 @@ #define QSGPAINTEDITEM_P_P_H #include "qsgitem_p.h" +#include <QtGui/qcolor.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgpathview.cpp b/src/declarative/items/qsgpathview.cpp index d37f7101a1..11733df53e 100644 --- a/src/declarative/items/qsgpathview.cpp +++ b/src/declarative/items/qsgpathview.cpp @@ -49,7 +49,8 @@ #include <QtGui/qevent.h> #include <QtGui/qevent.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qstylehints.h> #include <QtCore/qmath.h> #include <math.h> @@ -1163,7 +1164,7 @@ void QSGPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event) QPointF pathPoint = pointNear(event->localPos(), &newPc); if (!stealMouse) { QPointF delta = pathPoint - startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) { + if (qAbs(delta.x()) > qApp->styleHints()->startDragDistance() || qAbs(delta.y()) > qApp->styleHints()->startDragDistance()) { stealMouse = true; startPc = newPc; } diff --git a/src/declarative/items/qsgpincharea.cpp b/src/declarative/items/qsgpincharea.cpp index 6d89414cd0..d02477ee34 100644 --- a/src/declarative/items/qsgpincharea.cpp +++ b/src/declarative/items/qsgpincharea.cpp @@ -43,7 +43,8 @@ #include "qsgcanvas.h" #include <QtGui/qevent.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qstylehints.h> #include <float.h> #include <math.h> @@ -341,7 +342,7 @@ void QSGPinchArea::updatePinch() d->initPinch = true; } if (d->pinchActivated && !d->pinchRejected){ - const int dragThreshold = QApplication::startDragDistance(); + const int dragThreshold = qApp->styleHints()->startDragDistance(); QPointF p1 = touchPoint1.scenePos(); QPointF p2 = touchPoint2.scenePos(); qreal dx = p1.x() - p2.x(); diff --git a/src/declarative/items/qsgtext.cpp b/src/declarative/items/qsgtext.cpp index da34cc6d56..a00a217ee3 100644 --- a/src/declarative/items/qsgtext.cpp +++ b/src/declarative/items/qsgtext.cpp @@ -56,7 +56,7 @@ #include <QtGui/qtextdocument.h> #include <QtGui/qtextobject.h> #include <QtGui/qtextcursor.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> #include <private/qdeclarativestyledtext_p.h> #include <private/qdeclarativepixmapcache_p.h> @@ -1166,7 +1166,7 @@ bool QSGTextPrivate::determineHorizontalAlignment() { Q_Q(QSGText); if (hAlignImplicit && q->isComponentComplete()) { - bool alignToRight = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText; + bool alignToRight = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText; return setHAlign(alignToRight ? QSGText::AlignRight : QSGText::AlignLeft); } return false; diff --git a/src/declarative/items/qsgtextedit.cpp b/src/declarative/items/qsgtextedit.cpp index 6b9e4436a7..1f1de8ed49 100644 --- a/src/declarative/items/qsgtextedit.cpp +++ b/src/declarative/items/qsgtextedit.cpp @@ -47,7 +47,7 @@ #include "qsgsimplerectnode.h" #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> #include <QtGui/qevent.h> #include <QtGui/qpainter.h> #include <QtGui/qtextobject.h> @@ -56,7 +56,6 @@ #include <private/qdeclarativeglobal_p.h> #include <private/qtextcontrol_p.h> #include <private/qtextengine_p.h> -#include <private/qwidget_p.h> #include <private/qsgdistancefieldglyphcache_p.h> #include <private/qsgtexture_p.h> #include <private/qsgadaptationlayer_p.h> @@ -65,7 +64,6 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) -Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); /*! \qmlclass TextEdit QSGTextEdit \inqmlmodule QtQuick 2 @@ -551,7 +549,7 @@ bool QSGTextEditPrivate::determineHorizontalAlignment() { Q_Q(QSGTextEdit); if (hAlignImplicit && q->isComponentComplete()) { - bool alignToRight = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText; + bool alignToRight = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText; return setHAlign(alignToRight ? QSGTextEdit::AlignRight : QSGTextEdit::AlignLeft); } return false; @@ -1636,7 +1634,7 @@ void QSGTextEditPrivate::init() QObject::connect(control, SIGNAL(linkActivated(QString)), q, SIGNAL(linkActivated(QString))); #ifndef QT_NO_CLIPBOARD QObject::connect(q, SIGNAL(readOnlyChanged(bool)), q, SLOT(q_canPasteChanged())); - QObject::connect(QApplication::clipboard(), SIGNAL(dataChanged()), q, SLOT(q_canPasteChanged())); + QObject::connect(QGuiApplication::clipboard(), SIGNAL(dataChanged()), q, SLOT(q_canPasteChanged())); canPaste = control->canPaste(); #endif @@ -1910,7 +1908,7 @@ void QSGTextEdit::openSoftwareInputPanel() if (qApp) { if (canvas()) { QEvent event(QEvent::RequestSoftwareInputPanel); - QApplication::sendEvent(canvas(), &event); + QGuiApplication::sendEvent(canvas(), &event); } } } @@ -1959,7 +1957,7 @@ void QSGTextEdit::closeSoftwareInputPanel() if (qApp) { if (canvas()) { QEvent event(QEvent::CloseSoftwareInputPanel); - QApplication::sendEvent(canvas(), &event); + QGuiApplication::sendEvent(canvas(), &event); } } } diff --git a/src/declarative/items/qsgtextedit_p_p.h b/src/declarative/items/qsgtextedit_p_p.h index e4f74c0ef5..b670baf8aa 100644 --- a/src/declarative/items/qsgtextedit_p_p.h +++ b/src/declarative/items/qsgtextedit_p_p.h @@ -58,6 +58,7 @@ #include "qsgimplicitsizeitem_p_p.h" #include <QtDeclarative/qdeclarative.h> +#include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE class QTextLayout; diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index a7c1a122bb..22ee3c805d 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -44,26 +44,22 @@ #include "qsgcanvas.h" #include <private/qdeclarativeglobal_p.h> -#include <private/qwidget_p.h> #include <private/qsgdistancefieldglyphcache_p.h> #include <QtDeclarative/qdeclarativeinfo.h> #include <QtGui/qevent.h> -#include <QtWidgets/qinputcontext.h> #include <QTextBoundaryFinder> -#include <qstyle.h> #include <qsgtextnode_p.h> #include <qsgsimplerectnode.h> #include <QtGui/qplatforminputcontext_qpa.h> #include <private/qguiapplication_p.h> +#include <QtGui/qstylehints.h> QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) -Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); - /*! \qmlclass TextInput QSGTextInput \inqmlmodule QtQuick 2 @@ -408,7 +404,7 @@ bool QSGTextInputPrivate::determineHorizontalAlignment() if (hAlignImplicit) { // if no explicit alignment has been set, follow the natural layout direction of the text QString text = control->text(); - bool isRightToLeft = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : text.isRightToLeft(); + bool isRightToLeft = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : text.isRightToLeft(); return setHAlign(isRightToLeft ? QSGTextInput::AlignRight : QSGTextInput::AlignLeft); } return false; @@ -517,7 +513,7 @@ void QSGTextInput::setCursorVisible(bool on) if (d->cursorVisible == on) return; d->cursorVisible = on; - d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0); + d->control->setCursorBlinkPeriod(on ? qApp->styleHints()->cursorFlashTime() : 0); QRect r = d->control->cursorRect(); if (d->control->inputMask().isEmpty()) updateRect(r); @@ -1132,7 +1128,7 @@ void QSGTextInput::mouseMoveEvent(QMouseEvent *event) if (d->sendMouseEventToInputContext(event)) return; if (d->selectPressed) { - if (qAbs(int(event->localPos().x() - d->pressPos.x())) > QApplication::startDragDistance()) + if (qAbs(int(event->localPos().x() - d->pressPos.x())) > qApp->styleHints()->startDragDistance()) setKeepMouseGrab(true); moveCursorSelection(d->xToPos(event->localPos().x()), d->mouseSelectionMode); event->setAccepted(true); @@ -1363,7 +1359,7 @@ QVariant QSGTextInput::inputMethodQuery(Qt::InputMethodQuery property) const case Qt::ImCursorPosition: return QVariant(d->control->cursor()); case Qt::ImSurroundingText: - if (d->control->echoMode() == PasswordEchoOnEdit && !d->control->passwordEchoEditing()) + if (d->control->echoMode() == QLineControl::PasswordEchoOnEdit && !d->control->passwordEchoEditing()) return QVariant(displayText()); else return QVariant(text()); @@ -1738,7 +1734,7 @@ void QSGTextInput::openSoftwareInputPanel() if (qApp) { if (canvas()) { QEvent event(QEvent::RequestSoftwareInputPanel); - QApplication::sendEvent(canvas(), &event); + QCoreApplication::sendEvent(canvas(), &event); } } } @@ -1787,7 +1783,7 @@ void QSGTextInput::closeSoftwareInputPanel() if (qApp) { if (canvas()) { QEvent event(QEvent::CloseSoftwareInputPanel); - QApplication::sendEvent(canvas(), &event); + QCoreApplication::sendEvent(canvas(), &event); } } } @@ -1862,9 +1858,9 @@ void QSGTextInputPrivate::init() #ifndef QT_NO_CLIPBOARD q->connect(q, SIGNAL(readOnlyChanged(bool)), q, SLOT(q_canPasteChanged())); - q->connect(QApplication::clipboard(), SIGNAL(dataChanged()), + q->connect(QGuiApplication::clipboard(), SIGNAL(dataChanged()), q, SLOT(q_canPasteChanged())); - canPaste = !control->isReadOnly() && QApplication::clipboard()->text().length() != 0; + canPaste = !control->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0; #endif // QT_NO_CLIPBOARD q->connect(control, SIGNAL(updateMicroFocus()), q, SLOT(updateCursorRectangle())); @@ -2008,7 +2004,7 @@ void QSGTextInput::q_canPasteChanged() Q_D(QSGTextInput); bool old = d->canPaste; #ifndef QT_NO_CLIPBOARD - d->canPaste = !d->control->isReadOnly() && QApplication::clipboard()->text().length() != 0; + d->canPaste = !d->control->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0; #endif if(d->canPaste != old) emit canPasteChanged(); diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qsgtextnode_p.h index e9b9b98edf..31a1fbe558 100644 --- a/src/declarative/items/qsgtextnode_p.h +++ b/src/declarative/items/qsgtextnode_p.h @@ -46,6 +46,8 @@ #include <qsgtext_p.h> #include <qglyphrun.h> +#include <QtGui/qcolor.h> + QT_BEGIN_NAMESPACE class QTextLayout; |