From 1259c5768e410361bcd8b5cf0c2057a2ebabda83 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 30 Aug 2011 13:17:00 +0200 Subject: [PATCH] Remove the remaining dependencies onto QtWidgets Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta --- modules/qt_declarative.pri | 2 +- .../debugger/qdeclarativedebugserver.cpp | 4 +- src/declarative/declarative.pro | 2 +- src/declarative/items/context2d/qsgcontext2d.cpp | 11 +++----- src/declarative/items/qsganimation.cpp | 1 + src/declarative/items/qsgcanvas.cpp | 8 +++--- src/declarative/items/qsgcanvas.h | 2 +- src/declarative/items/qsgcanvas_p.h | 2 +- src/declarative/items/qsgflickable.cpp | 11 +++++---- src/declarative/items/qsgitem.cpp | 7 +++-- src/declarative/items/qsgitem.h | 1 - src/declarative/items/qsgitemsmodule.cpp | 3 -- src/declarative/items/qsgmousearea.cpp | 3 +- src/declarative/items/qsgmousearea_p.h | 2 + src/declarative/items/qsgpainteditem.h | 1 + src/declarative/items/qsgpainteditem_p.h | 1 + src/declarative/items/qsgpathview.cpp | 5 ++- src/declarative/items/qsgpincharea.cpp | 5 ++- src/declarative/items/qsgtext.cpp | 4 +- src/declarative/items/qsgtextedit.cpp | 12 ++++----- src/declarative/items/qsgtextedit_p_p.h | 1 + src/declarative/items/qsgtextinput.cpp | 24 ++++++++----------- src/declarative/items/qsgtextnode_p.h | 2 + src/declarative/particles/qsgimageparticle_p.h | 1 + .../qml/parser/qdeclarativejsparser.cpp | 2 +- src/declarative/qml/qdeclarativecomponent.cpp | 1 - src/declarative/qml/qdeclarativeengine.cpp | 1 - src/declarative/qml/qdeclarativemetatype.cpp | 16 ------------- src/declarative/qml/qdeclarativevme.cpp | 16 +++++++----- .../scenegraph/coreapi/qsgdefaultrenderer.cpp | 2 +- src/declarative/scenegraph/coreapi/qsgrenderer.cpp | 4 +- src/declarative/scenegraph/qsgcontext.cpp | 2 +- src/declarative/scenegraph/qsgcontextplugin.cpp | 4 +- src/declarative/scenegraph/util/qsgpainternode_p.h | 2 + src/declarative/util/qdeclarativeapplication.cpp | 8 +++--- .../util/qdeclarativestateoperations.cpp | 1 - src/declarative/util/qdeclarativesystempalette.cpp | 8 +++--- src/declarative/util/qdeclarativexmllistmodel.cpp | 1 - 38 files changed, 84 insertions(+), 99 deletions(-) diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index ef7db54..54727d4 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -11,7 +11,7 @@ QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE QT.declarative.imports = $$QT_MODULE_IMPORT_BASE -QT.declarative.depends = gui network opengl xmlpatterns +QT.declarative.depends = gui network xmlpatterns QT.declarative.DEFINES = QT_DECLARATIVE_LIB QT_CONFIG += declarative diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index e7785d0..6e2db4f 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -167,7 +167,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() if (!commandLineTested) { commandLineTested = true; - QApplicationPrivate *appD = static_cast(QObjectPrivate::get(qApp)); + QGuiApplicationPrivate *appD = static_cast(QObjectPrivate::get(qApp)); #ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL // ### remove port definition when protocol is changed int port = 0; diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 78717c9..4e5ff4c 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI += ../../modules/qt_declarative.pri -QT = core-private gui gui-private network widgets-private sql v8-private +QT = core-private gui gui-private network sql v8-private DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp index 22a9c70..7a8465a 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -47,9 +47,7 @@ #include #include "private/qsgcontext_p.h" -#include -#include -#include +#include #include #include #include "qdeclarativepixmapcache_p.h" @@ -78,10 +76,6 @@ void copy_vector(QVector* dst, const QVector& 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 446dc5a..0822974 100644 --- a/src/declarative/items/qsganimation.cpp +++ b/src/declarative/items/qsganimation.cpp @@ -47,6 +47,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp index f97028a..96af2a5 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 e364ee8..b396788 100644 --- a/src/declarative/items/qsgcanvas.h +++ b/src/declarative/items/qsgcanvas.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h index 6915bff..acd52a8 100644 --- a/src/declarative/items/qsgcanvas_p.h +++ b/src/declarative/items/qsgcanvas_p.h @@ -63,11 +63,11 @@ #include #include #include -#include #include #include #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index 92554f8..21474be 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -46,7 +46,8 @@ #include #include -#include +#include +#include #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 c7df26d..765fe34 100644 --- a/src/declarative/items/qsgitem.cpp +++ b/src/declarative/items/qsgitem.cpp @@ -51,8 +51,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -2240,8 +2240,6 @@ void QSGItemPrivate::data_append(QDeclarativeListProperty *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 *prop, QObjec QSGItem *item = static_cast(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 bff32e3..9cd549d 100644 --- a/src/declarative/items/qsgitem.h +++ b/src/declarative/items/qsgitem.h @@ -50,7 +50,6 @@ #include #include #include -#include QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp index 9547dc0..0d147d3 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(); #endif qmlRegisterType(); -#ifndef QT_NO_ACTION - qmlRegisterType(); -#endif qmlRegisterType(); qmlRegisterType(); qRegisterMetaType("QSGAnchorLine"); diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index 547df31..cae0be6 100644 --- a/src/declarative/items/qsgmousearea.cpp +++ b/src/declarative/items/qsgmousearea.cpp @@ -47,6 +47,7 @@ #include #include +#include #include @@ -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 c7d3cb7..0ec9c6b 100644 --- a/src/declarative/items/qsgmousearea_p.h +++ b/src/declarative/items/qsgmousearea_p.h @@ -45,6 +45,8 @@ #include "qsgitem.h" +#include + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgpainteditem.h b/src/declarative/items/qsgpainteditem.h index 3fc8fb8..244e24b 100644 --- a/src/declarative/items/qsgpainteditem.h +++ b/src/declarative/items/qsgpainteditem.h @@ -43,6 +43,7 @@ #define QSGPAINTEDITEM_P_H #include +#include QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qsgpainteditem_p.h index 87b9f68..3ad4466 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 QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgpathview.cpp b/src/declarative/items/qsgpathview.cpp index d37f710..11733df 100644 --- a/src/declarative/items/qsgpathview.cpp +++ b/src/declarative/items/qsgpathview.cpp @@ -49,7 +49,8 @@ #include #include -#include +#include +#include #include #include @@ -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 6d89414..d02477e 100644 --- a/src/declarative/items/qsgpincharea.cpp +++ b/src/declarative/items/qsgpincharea.cpp @@ -43,7 +43,8 @@ #include "qsgcanvas.h" #include -#include +#include +#include #include #include @@ -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 da34cc6..a00a217 100644 --- a/src/declarative/items/qsgtext.cpp +++ b/src/declarative/items/qsgtext.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include @@ -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 6b9e443..1f1de8e 100644 --- a/src/declarative/items/qsgtextedit.cpp +++ b/src/declarative/items/qsgtextedit.cpp @@ -47,7 +47,7 @@ #include "qsgsimplerectnode.h" #include -#include +#include #include #include #include @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -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 e4f74c0..b670baf 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 +#include QT_BEGIN_NAMESPACE class QTextLayout; diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index a7c1a12..22ee3c8 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -44,26 +44,22 @@ #include "qsgcanvas.h" #include -#include #include #include #include -#include #include -#include #include #include #include #include +#include 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 e9b9b98..31a1fbe 100644 --- a/src/declarative/items/qsgtextnode_p.h +++ b/src/declarative/items/qsgtextnode_p.h @@ -46,6 +46,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE class QTextLayout; diff --git a/src/declarative/particles/qsgimageparticle_p.h b/src/declarative/particles/qsgimageparticle_p.h index eb890e2..5c684f8 100644 --- a/src/declarative/particles/qsgimageparticle_p.h +++ b/src/declarative/particles/qsgimageparticle_p.h @@ -45,6 +45,7 @@ #include "qsgstochasticdirection_p.h" #include #include +#include QT_BEGIN_HEADER diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index 546cfdd..3b5c9ac 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include +#include #include diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 49aa6d9..b018928 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -61,7 +61,6 @@ #include #include #include -#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 051739b..353a86c 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -91,7 +91,6 @@ #include #include #include -#include #include #include diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 091a561..4289dee 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -1346,13 +1346,11 @@ QT_END_NAMESPACE #include #include #include -#include #include #include #include #include #include -#include #include #include @@ -1425,7 +1423,6 @@ bool QDeclarativeMetaType::canCopy(int type) case QMetaType::QBrush: case QMetaType::QColor: case QMetaType::QPalette: - case QMetaType::QIcon: case QMetaType::QImage: case QMetaType::QPolygon: case QMetaType::QRegion: @@ -1433,7 +1430,6 @@ bool QDeclarativeMetaType::canCopy(int type) #ifndef QT_NO_CURSOR case QMetaType::QCursor: #endif - case QMetaType::QSizePolicy: case QMetaType::QKeySequence: case QMetaType::QPen: case QMetaType::QTextLength: @@ -1611,9 +1607,6 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) case QMetaType::QPalette: *static_cast(data) = *static_cast(copy); return true; - case QMetaType::QIcon: - *static_cast(data) = *static_cast(copy); - return true; case QMetaType::QImage: *static_cast(data) = *static_cast(copy); return true; @@ -1631,9 +1624,6 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) *static_cast(data) = *static_cast(copy); return true; #endif - case QMetaType::QSizePolicy: - *static_cast(data) = *static_cast(copy); - return true; case QMetaType::QKeySequence: *static_cast(data) = *static_cast(copy); return true; @@ -1822,9 +1812,6 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) case QMetaType::QPalette: *static_cast(data) = NS(QPalette)(); return true; - case QMetaType::QIcon: - *static_cast(data) = NS(QIcon)(); - return true; case QMetaType::QImage: *static_cast(data) = NS(QImage)(); return true; @@ -1842,9 +1829,6 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) *static_cast(data) = NS(QCursor)(); return true; #endif - case QMetaType::QSizePolicy: - *static_cast(data) = NS(QSizePolicy)(); - return true; case QMetaType::QKeySequence: *static_cast(data) = NS(QKeySequence)(); return true; diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index bf29086..d905453 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -65,7 +65,6 @@ #include "qdeclarativescriptstring_p.h" #include -#include #include #include #include @@ -276,17 +275,20 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack, } if (!stack.isEmpty()) { QObject *parent = stack.top(); - if (o->isWidgetType()) { +#if 0 // ### refactor + if (o->isWidgetType()) { QWidget *widget = static_cast(o); if (parent->isWidgetType()) { QWidget *parentWidget = static_cast(parent); - widget->setParent(parentWidget); - } else { + widget->setParent(parentWidget); + } else { // TODO: parent might be a layout } - } else { - QDeclarative_setParent_noEvent(o, parent); - } + } else +#endif + { + QDeclarative_setParent_noEvent(o, parent); + } } stack.push(o); QML_END_INSTR(CreateObject) diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp index ce05e76..a215968 100644 --- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp @@ -46,7 +46,7 @@ #include "qsgmaterial.h" #include -#include +#include #include #include diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp index 0df00b5..57a3059 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include @@ -600,7 +600,7 @@ static inline GLenum qt_drawTypeForPattern(QSGGeometry::DataPattern p) void QSGRenderer::draw(const QSGMaterialShader *shader, const QSGGeometry *g) { // ### remove before final release... - static bool use_vbo = !QApplication::arguments().contains(QLatin1String("--no-vbo")); + static bool use_vbo = !QGuiApplication::arguments().contains(QLatin1String("--no-vbo")); const void *vertexData; int vertexByteSize = g->vertexCount() * g->stride(); diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/declarative/scenegraph/qsgcontext.cpp index c472ed1..7adbb32 100644 --- a/src/declarative/scenegraph/qsgcontext.cpp +++ b/src/declarative/scenegraph/qsgcontext.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/src/declarative/scenegraph/qsgcontextplugin.cpp b/src/declarative/scenegraph/qsgcontextplugin.cpp index c744444..79bcbf9 100644 --- a/src/declarative/scenegraph/qsgcontextplugin.cpp +++ b/src/declarative/scenegraph/qsgcontextplugin.cpp @@ -41,7 +41,7 @@ #include "qsgcontextplugin_p.h" #include -#include +#include #include #include @@ -69,7 +69,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, */ QSGContext *QSGContext::createDefaultContext() { - const QStringList args = QApplication::arguments(); + const QStringList args = QGuiApplication::arguments(); QString device; for (int index = 0; index < args.count(); ++index) { if (args.at(index).startsWith(QLatin1String("--device="))) { diff --git a/src/declarative/scenegraph/util/qsgpainternode_p.h b/src/declarative/scenegraph/util/qsgpainternode_p.h index 50fb521..c14e770 100644 --- a/src/declarative/scenegraph/util/qsgpainternode_p.h +++ b/src/declarative/scenegraph/util/qsgpainternode_p.h @@ -47,6 +47,8 @@ #include "qsgtexture_p.h" #include "qsgpainteditem.h" +#include + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp index f745ba6..e03dce7 100644 --- a/src/declarative/util/qdeclarativeapplication.cpp +++ b/src/declarative/util/qdeclarativeapplication.cpp @@ -41,7 +41,7 @@ #include "qdeclarativeapplication_p.h" #include -#include +#include QT_BEGIN_NAMESPACE @@ -49,8 +49,8 @@ class QDeclarativeApplicationPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QDeclarativeApplication) public: - QDeclarativeApplicationPrivate() : active(QApplication::activeWindow() != 0), - layoutDirection(QApplication::layoutDirection()) {} + QDeclarativeApplicationPrivate() : active(QGuiApplication::activeWindow() != 0), + layoutDirection(QGuiApplication::layoutDirection()) {} bool active; Qt::LayoutDirection layoutDirection; }; @@ -100,7 +100,7 @@ bool QDeclarativeApplication::eventFilter(QObject *obj, QEvent *event) } } if (event->type() == QEvent::LayoutDirectionChange) { - Qt::LayoutDirection direction = QApplication::layoutDirection(); + Qt::LayoutDirection direction = QGuiApplication::layoutDirection(); if (d->layoutDirection != direction) { d->layoutDirection = direction; emit layoutDirectionChanged(); diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 4f198a5..89cc947 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -53,7 +53,6 @@ #include "private/qdeclarativestate_p_p.h" #include -#include #include #include diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index 7c5a535..b4216cb 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -41,7 +41,7 @@ #include "private/qdeclarativesystempalette_p.h" -#include +#include #include @@ -84,7 +84,7 @@ QDeclarativeSystemPalette::QDeclarativeSystemPalette(QObject *parent) : QObject(*(new QDeclarativeSystemPalettePrivate), parent) { Q_D(QDeclarativeSystemPalette); - d->palette = QApplication::palette(); + d->palette = QGuiApplication::palette(); d->group = QPalette::Active; qApp->installEventFilter(this); } @@ -291,7 +291,7 @@ bool QDeclarativeSystemPalette::eventFilter(QObject *watched, QEvent *event) { if (watched == qApp) { if (event->type() == QEvent::ApplicationPaletteChange) { - QApplication::postEvent(this, new QEvent(QEvent::ApplicationPaletteChange)); + QGuiApplication::postEvent(this, new QEvent(QEvent::ApplicationPaletteChange)); return false; } } @@ -302,7 +302,7 @@ bool QDeclarativeSystemPalette::event(QEvent *event) { Q_D(QDeclarativeSystemPalette); if (event->type() == QEvent::ApplicationPaletteChange) { - d->palette = QApplication::palette(); + d->palette = QGuiApplication::palette(); emit paletteChanged(); return true; } diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 47ef762..82b7e7d 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include -- 1.7.2.5