diff options
Diffstat (limited to 'tests/auto/qtquick1')
14 files changed, 18 insertions, 19 deletions
diff --git a/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp index 795c91e9c4..7aef248bb6 100644 --- a/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp +++ b/tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <QSignalSpy> -#include <QtGui/QGraphicsWidget> -#include <private/qgraphicsitem_p.h> +#include <QtWidgets/QGraphicsWidget> +#include <QtWidgets/5.0.0/QtWidgets/private/qgraphicsitem_p.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtQuick1/qdeclarativeview.h> diff --git a/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index dfb2329668..14765e41db 100644 --- a/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -44,8 +44,8 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtQuick1/qdeclarativeitem.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qgraphicsscene.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/QGraphicsScene> class tst_qdeclarativeapplication : public QObject { diff --git a/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index a0473a620b..80bf71a191 100644 --- a/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -45,7 +45,7 @@ #include <QtQuick1/qdeclarativeview.h> #include <private/qdeclarativeflickable_p.h> #include <private/qdeclarativevaluetype_p.h> -#include <QtGui/qgraphicswidget.h> +#include <QtWidgets/qgraphicswidget.h> #include <math.h> #include "../../../shared/util.h" diff --git a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp index 606b5fcab8..e96af5100c 100644 --- a/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/qstringlistmodel.h> +#include <QtWidgets/qstringlistmodel.h> #include <QtQuick1/qdeclarativeview.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> diff --git a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp index d2519b0f9f..c9cce3d6b3 100644 --- a/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtGui/QStringListModel> +#include <QtWidgets/QStringListModel> #include <QtQuick1/qdeclarativeview.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecontext.h> diff --git a/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp index baed4973dc..e73f9e0cf3 100644 --- a/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtGui/QGraphicsWidget> -#include <QtGui/QGraphicsScene> +#include <QtWidgets/QGraphicsWidget> +#include <QtWidgets/QGraphicsScene> #include <QSignalSpy> #include <QtDeclarative/qdeclarativeengine.h> diff --git a/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp index 60ad1033fe..32eba6132b 100644 --- a/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp +++ b/tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp @@ -46,7 +46,7 @@ #include <QtQuick1/private/qdeclarativetransition_p.h> #include <QtQuick1/private/qdeclarativeitem_p.h> #include <qdeclarativeexpression.h> -#include <QtGui/qgraphicswidget.h> +#include <QtWidgets/qgraphicswidget.h> #include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN diff --git a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp index 8398ec6061..801d631629 100644 --- a/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp @@ -49,7 +49,7 @@ #include <QGraphicsSceneMouseEvent> #include <qmath.h> #include <QtQuick1/QDeclarativeView> -#include <private/qapplication_p.h> +#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h> #include <limits.h> #include "../../../shared/util.h" diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index bd8dab01e3..bcad6377f3 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -58,7 +58,7 @@ #include <QInputContext> #include <QClipboard> #include <QMimeData> -#include <private/qapplication_p.h> +#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h> #include <private/qtextcontrol_p.h> #ifdef Q_OS_SYMBIAN diff --git a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index eb08b2a396..633ab17a27 100644 --- a/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -50,7 +50,7 @@ #include <QDir> #include <QStyle> #include <QInputContext> -#include <private/qapplication_p.h> +#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h> #include "qplatformdefs.h" diff --git a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro index 603eab08d7..d2b157ec1b 100644 --- a/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro @@ -11,4 +11,4 @@ symbian: { } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } -QT += core-private gui-private declarative-private qtquick1-private +QT += core-private gui-private declarative-private qtquick1-private widgets diff --git a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp index 325071f489..9b844de946 100644 --- a/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp @@ -44,7 +44,7 @@ #include <QtDeclarative/qdeclarativecontext.h> #include <QtQuick1/qdeclarativeview.h> #include <QtQuick1/qdeclarativeitem.h> -#include <QtGui/qgraphicswidget.h> +#include <QtWidgets/qgraphicswidget.h> #include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN diff --git a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro index 20d154a217..afccbcc6df 100644 --- a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro @@ -6,9 +6,8 @@ include(../../../../tools/qmlviewer/qml.pri) SOURCES += tst_qdeclarativeviewer.cpp -include(../symbianlibs.pri) - symbian: { + include(../symbianlibs.pri) importFiles.files = data importFiles.path = . DEPLOYMENT += importFiles @@ -17,4 +16,4 @@ symbian: { } CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private qtquick1-private +QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private diff --git a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index f4fc4f0d46..e6bd2d0a31 100644 --- a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -44,7 +44,7 @@ #include <QtQuick1/qdeclarativeview.h> #include <QtQuick1/qdeclarativeitem.h> #include <QtDeclarative/qdeclarativecontext.h> -#include <QtGui/qmenubar.h> +#include <QtWidgets/qmenubar.h> #include <QSignalSpy> #include "../../../shared/util.h" #include "qmlruntime.h" |