diff options
Diffstat (limited to 'src/declarative')
22 files changed, 36 insertions, 37 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index aa638e468e..d8126d0d9c 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-private script-private network script opengl-private +QT = core-private gui-private script-private network script opengl-private widgets-private contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING 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 97234a6315..6ee87cf144 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -47,9 +47,9 @@ #include <QtCore/qdebug.h> #include "private/qsgcontext_p.h" -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qapplication.h> -#include <QtGui/qgraphicseffect.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qgraphicseffect.h> #include <qdeclarativeinfo.h> #include <QtCore/qmath.h> #include "qdeclarativepixmapcache_p.h" diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp index ecb4e2b524..a2af67ce37 100644 --- a/src/declarative/items/qsgcanvas.cpp +++ b/src/declarative/items/qsgcanvas.cpp @@ -53,9 +53,9 @@ #include <private/qabstractanimation_p.h> #include <QtGui/qpainter.h> -#include <QtGui/qgraphicssceneevent.h> +#include <QtWidgets/qgraphicssceneevent.h> #include <QtGui/qmatrix4x4.h> -#include <QtGui/qinputcontext.h> +#include <QtWidgets/qinputcontext.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qabstractanimation.h> @@ -417,7 +417,6 @@ void QSGCanvas::sceneGraphChanged() // d->needsRepaint = true; } - QSGCanvasPrivate::QSGCanvasPrivate() : rootItem(0) , activeFocusItem(0) diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qsgcanvas.h index a5f69ff559..2fb80bf954 100644 --- a/src/declarative/items/qsgcanvas.h +++ b/src/declarative/items/qsgcanvas.h @@ -44,7 +44,7 @@ #include <QtCore/qmetatype.h> #include <QtOpenGL/qgl.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index be6e97f363..1d8f107abc 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -45,8 +45,8 @@ #include "qsgcanvas_p.h" #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qapplication.h> #include "qplatformdefs.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp index 55d84a7fa5..5274e312e5 100644 --- a/src/declarative/items/qsgitem.cpp +++ b/src/declarative/items/qsgitem.cpp @@ -51,9 +51,9 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtGui/qgraphicstransform.h> +#include <QtWidgets/qgraphicstransform.h> #include <QtGui/qpen.h> -#include <QtGui/qinputcontext.h> +#include <QtWidgets/qinputcontext.h> #include <QtCore/qdebug.h> #include <QtCore/qcoreevent.h> #include <QtCore/qnumeric.h> diff --git a/src/declarative/items/qsgitem.h b/src/declarative/items/qsgitem.h index 2cd2082acd..7dc43fbc8b 100644 --- a/src/declarative/items/qsgitem.h +++ b/src/declarative/items/qsgitem.h @@ -48,9 +48,9 @@ #include <QtCore/QObject> #include <QtCore/QList> -#include <QtGui/qgraphicssceneevent.h> +#include <QtWidgets/qgraphicssceneevent.h> #include <QtGui/qfont.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qsgmousearea.cpp index ac577a4810..b35c14624a 100644 --- a/src/declarative/items/qsgmousearea.cpp +++ b/src/declarative/items/qsgmousearea.cpp @@ -45,8 +45,8 @@ #include "qsgevent.h" #include "qsgevents_p_p.h" -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qapplication.h> #include <float.h> diff --git a/src/declarative/items/qsgmousearea_p_p.h b/src/declarative/items/qsgmousearea_p_p.h index 30ec75c3a9..ff531c627c 100644 --- a/src/declarative/items/qsgmousearea_p_p.h +++ b/src/declarative/items/qsgmousearea_p_p.h @@ -56,7 +56,7 @@ #include "qsgitem_p.h" -#include <QtGui/qgraphicssceneevent.h> +#include <QtWidgets/qgraphicssceneevent.h> #include <QtCore/qbasictimer.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgpathview.cpp b/src/declarative/items/qsgpathview.cpp index e10575cf7b..0bc45fd037 100644 --- a/src/declarative/items/qsgpathview.cpp +++ b/src/declarative/items/qsgpathview.cpp @@ -48,8 +48,8 @@ #include <private/qlistmodelinterface_p.h> #include <QtGui/qevent.h> -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qapplication.h> #include <QtCore/qmath.h> #include <math.h> diff --git a/src/declarative/items/qsgpincharea.cpp b/src/declarative/items/qsgpincharea.cpp index a9bf0286fa..f86c18dfcf 100644 --- a/src/declarative/items/qsgpincharea.cpp +++ b/src/declarative/items/qsgpincharea.cpp @@ -42,8 +42,8 @@ #include "qsgpincharea_p_p.h" #include "qsgcanvas.h" -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qapplication.h> #include <float.h> #include <math.h> diff --git a/src/declarative/items/qsgtext.cpp b/src/declarative/items/qsgtext.cpp index f3b2752479..cc6a4b406d 100644 --- a/src/declarative/items/qsgtext.cpp +++ b/src/declarative/items/qsgtext.cpp @@ -50,13 +50,13 @@ #include <private/qsgtexture_p.h> #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtGui/qgraphicssceneevent.h> +#include <QtWidgets/qgraphicssceneevent.h> #include <QtGui/qabstracttextdocumentlayout.h> #include <QtGui/qpainter.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextobject.h> #include <QtGui/qtextcursor.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <private/qdeclarativestyledtext_p.h> #include <private/qdeclarativepixmapcache_p.h> diff --git a/src/declarative/items/qsgtextedit.cpp b/src/declarative/items/qsgtextedit.cpp index 4797630441..00c9d5ff16 100644 --- a/src/declarative/items/qsgtextedit.cpp +++ b/src/declarative/items/qsgtextedit.cpp @@ -45,8 +45,8 @@ #include "qsgcanvas.h" #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtGui/qapplication.h> -#include <QtGui/qgraphicssceneevent.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qgraphicssceneevent.h> #include <QtGui/qpainter.h> #include <QtGui/qtextobject.h> #include <QtCore/qmath.h> diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index eb5e23187c..b60143a67d 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -47,8 +47,8 @@ #include <private/qwidget_p.h> #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qinputcontext.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qinputcontext.h> #include <QTextBoundaryFinder> #include <qstyle.h> @@ -465,7 +465,7 @@ void QSGTextInput::setEchoMode(QSGTextInput::EchoMode echo) Q_D(QSGTextInput); if (echoMode() == echo) return; - d->control->setEchoMode((uint)echo); + d->control->setEchoMode((QLineControl::EchoMode)echo); d->updateInputMethodHints(); q_textChanged(); emit echoModeChanged(echoMode()); diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index d820c5d67a..01132e5362 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtCore/QtDebug> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <string.h> diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index cf672ef337..8fdc7b1c22 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -91,7 +91,7 @@ #include <QtCore/qmutex.h> #include <QtGui/qcolor.h> #include <QtGui/qvector3d.h> -#include <QtGui/qsound.h> +#include <QtWidgets/qsound.h> #include <QtCore/qcryptographichash.h> #include <private/qobject_p.h> diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 18eea0b614..c5cc23de7c 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -1093,13 +1093,13 @@ QT_END_NAMESPACE #include <QtGui/qbrush.h> #include <QtGui/qcolor.h> #include <QtGui/qpalette.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <QtGui/qimage.h> #include <QtGui/qpolygon.h> #include <QtGui/qregion.h> #include <QtGui/qbitmap.h> #include <QtGui/qcursor.h> -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qsizepolicy.h> #include <QtGui/qkeysequence.h> #include <QtGui/qpen.h> diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp index 382ac37d2c..8af626e286 100644 --- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp @@ -46,7 +46,7 @@ #include "qsgmaterial.h" #include <QtCore/qvarlengtharray.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtCore/qpair.h> #include <QtCore/QElapsedTimer> diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp index e5c6bfb4f8..78551b139b 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp @@ -48,7 +48,7 @@ #include <QGLShaderProgram> #include <qglframebufferobject.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <qdatetime.h> diff --git a/src/declarative/scenegraph/qsgcontextplugin.cpp b/src/declarative/scenegraph/qsgcontextplugin.cpp index b5e74e6cc3..c744444aeb 100644 --- a/src/declarative/scenegraph/qsgcontextplugin.cpp +++ b/src/declarative/scenegraph/qsgcontextplugin.cpp @@ -41,7 +41,7 @@ #include "qsgcontextplugin_p.h" #include <private/qsgcontext_p.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/qlibraryinfo.h> diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp index 11b0b636cb..f745ba6fa8 100644 --- a/src/declarative/util/qdeclarativeapplication.cpp +++ b/src/declarative/util/qdeclarativeapplication.cpp @@ -41,7 +41,7 @@ #include "qdeclarativeapplication_p.h" #include <private/qobject_p.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 0ced8ebd61..33ee99bba5 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -53,7 +53,7 @@ #include "private/qdeclarativestate_p_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicsitem.h> #include <QtCore/qmath.h> #include <private/qobject_p.h> |