diff options
Diffstat (limited to 'src/qtquick1')
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeflipable.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem.cpp | 3 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem.h | 6 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem_p.h | 2 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp | 6 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativerectangle.cpp | 1 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativetextinput.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/qtquick1.pro | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativeapplication.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativestateoperations.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativeview.cpp | 2 | ||||
-rw-r--r-- | src/qtquick1/util/qdeclarativeview.h | 6 |
14 files changed, 22 insertions, 18 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp b/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp index e4683eecab..8db733ba2e 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp @@ -49,6 +49,8 @@ #include <QNetworkReply> #include <QFile> +#include <QtWidgets/qdrawutil.h> + QT_BEGIN_NAMESPACE diff --git a/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp b/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp index a4f83c1fb5..789cadafb4 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeflipable.cpp @@ -46,7 +46,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> -#include <QtGui/qgraphicstransform.h> +#include <QtWidgets/qgraphicstransform.h> QT_BEGIN_NAMESPACE diff --git a/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp b/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp index 4797033bff..b3285716ca 100644 --- a/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp @@ -43,7 +43,7 @@ #include "QtQuick1/private/qdeclarativeitem_p.h" -#include <QtGui/qgraphicsscene.h> +#include <QtWidgets/qgraphicsscene.h> #include <QEvent> QT_BEGIN_NAMESPACE diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp index d2bfc578dd..a4654e4fe8 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp @@ -60,9 +60,10 @@ #include <QGraphicsSceneMouseEvent> #include <QtCore/qnumeric.h> #include <QtScript/qscriptengine.h> -#include <QtGui/qgraphicstransform.h> #include <private/qv8engine_p.h> +#include <QtWidgets/qgraphicstransform.h> +#include <private/qlistmodelinterface_p.h> #include <float.h> diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.h b/src/qtquick1/graphicsitems/qdeclarativeitem.h index a3f4931316..609af803f6 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.h +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.h @@ -47,10 +47,10 @@ #include <QtCore/QObject> #include <QtCore/QList> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qgraphicstransform.h> #include <QtGui/qfont.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicstransform.h> +#include <QtWidgets/qaction.h> QT_BEGIN_HEADER diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h index 58d57abbf3..0604194004 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h +++ b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h @@ -72,7 +72,7 @@ #include <QtCore/qrect.h> #include <QtCore/qdebug.h> -#include <private/qgraphicsitem_p.h> +#include <QtWidgets/private/qgraphicsitem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp index 47fd2ddf38..0a20b949b8 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp @@ -41,10 +41,10 @@ #include "QtQuick1/private/qdeclarativeitemsmodule_p.h" -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> #include <QtGui/qvalidator.h> -#include <QtGui/qgraphicseffect.h> -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicseffect.h> +#include <QtWidgets/qgraphicsitem.h> #include "QtQuick1/private/qdeclarativeevents_p_p.h" #include "QtQuick1/private/qdeclarativescalegrid_p_p.h" diff --git a/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp b/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp index 4eb8a96883..b67536cc86 100644 --- a/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativerectangle.cpp @@ -45,6 +45,7 @@ #include <QPainter> #include <QStringBuilder> #include <QtCore/qmath.h> +#include <QtWidgets/qdrawutil.h> QT_BEGIN_NAMESPACE diff --git a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp index a14d837be0..271595a863 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp @@ -900,7 +900,7 @@ void QDeclarative1TextInput::setEchoMode(QDeclarative1TextInput::EchoMode echo) Q_D(QDeclarative1TextInput); 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/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro index e3dd0298cd..e7db6062fb 100644 --- a/src/qtquick1/qtquick1.pro +++ b/src/qtquick1/qtquick1.pro @@ -7,7 +7,7 @@ CONFIG += module CONFIG += dll warn_on MODULE_PRI += ../../modules/qt_qtquick1.pri -QT += testlib-private declarative script testlib declarative-private core-private gui-private script-private network +QT += testlib-private declarative script testlib declarative-private core-private gui-private script-private network widgets-private DEFINES += QT_NO_URL_CAST_FROM_STRING load(qt_module_config) diff --git a/src/qtquick1/util/qdeclarativeapplication.cpp b/src/qtquick1/util/qdeclarativeapplication.cpp index 3cc572f27b..0947fe4f15 100644 --- a/src/qtquick1/util/qdeclarativeapplication.cpp +++ b/src/qtquick1/util/qdeclarativeapplication.cpp @@ -41,7 +41,7 @@ #include "QtQuick1/private/qdeclarativeapplication_p.h" #include <private/qobject_p.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/qtquick1/util/qdeclarativestateoperations.cpp b/src/qtquick1/util/qdeclarativestateoperations.cpp index 47420f370e..37ebe3e248 100644 --- a/src/qtquick1/util/qdeclarativestateoperations.cpp +++ b/src/qtquick1/util/qdeclarativestateoperations.cpp @@ -55,7 +55,7 @@ #include <QtQuick1/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> diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp index 32f2183cad..5f0e53a482 100644 --- a/src/qtquick1/util/qdeclarativeview.cpp +++ b/src/qtquick1/util/qdeclarativeview.cpp @@ -65,8 +65,8 @@ #include <qgraphicswidget.h> #include <qbasictimer.h> #include <QtCore/qabstractanimation.h> -#include <private/qgraphicsview_p.h> #include <QtQuick1/private/qdeclarativeitem_p.h> +#include <QtWidgets/private/qgraphicsview_p.h> #include <private/qabstractanimation_p.h> #include <QtQuick1/private/qdeclarativeitemchangelistener_p.h> diff --git a/src/qtquick1/util/qdeclarativeview.h b/src/qtquick1/util/qdeclarativeview.h index 39a2322f99..b655d2830f 100644 --- a/src/qtquick1/util/qdeclarativeview.h +++ b/src/qtquick1/util/qdeclarativeview.h @@ -44,9 +44,9 @@ #include <QtCore/qdatetime.h> #include <QtCore/qurl.h> -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER |