diff options
18 files changed, 32 insertions, 31 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index 3323d54246..3cb35e5738 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -50,7 +50,7 @@ #include <QtDeclarative/private/qdeclarativedebughelper_p.h> #include "QtDeclarative/private/qdeclarativeinspectorservice_p.h" -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QVBoxLayout> #include <QtGui/QMouseEvent> #include <QtCore/QSettings> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp index da9f442026..98fbc7e453 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp @@ -44,7 +44,7 @@ #include "../qdeclarativeviewinspector.h" #include "../qmlinspectorconstants.h" -#include <QtGui/QGraphicsPolygonItem> +#include <QtWidgets/QGraphicsPolygonItem> #include <QtCore/QTimer> #include <QtCore/QObject> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp index 72e1380146..5058f5e471 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp @@ -48,7 +48,7 @@ #include <QtCore/QRectF> #include <QtGui/QRgb> #include <QtGui/QImage> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QPalette> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h b/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h index 4dccc0b6f3..15f9a27fa4 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h @@ -42,7 +42,7 @@ #ifndef LIVELAYERITEM_H #define LIVELAYERITEM_H -#include <QtGui/QGraphicsObject> +#include <QtWidgets/QGraphicsObject> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp index b08682a396..eda81f0775 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp @@ -43,7 +43,7 @@ #include "../qdeclarativeviewinspector_p.h" -#include <QtGui/QGraphicsItem> +#include <QtWidgets/QGraphicsItem> #include <QtCore/QDebug> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp index c57bc0e26c..036eb975a8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp @@ -44,9 +44,9 @@ #include "../qdeclarativeviewinspector_p.h" #include "../qmlinspectorconstants.h" -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QGraphicsObject> -#include <QtGui/QGraphicsScene> +#include <QtWidgets/QGraphicsRectItem> +#include <QtWidgets/QGraphicsObject> +#include <QtWidgets/QGraphicsScene> #include <QtGui/QPen> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp index 4e144589b7..23577561a4 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp @@ -44,9 +44,9 @@ #include "../qmlinspectorconstants.h" #include <QtGui/QPen> -#include <QtGui/QGraphicsRectItem> -#include <QtGui/QGraphicsObject> -#include <QtGui/QGraphicsScene> +#include <QtWidgets/QGraphicsRectItem> +#include <QtWidgets/QGraphicsObject> +#include <QtWidgets/QGraphicsScene> #include <QtCore/QtDebug> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp index 9b52de1c53..884e1928a4 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp @@ -44,13 +44,13 @@ #include "../qdeclarativeviewinspector_p.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QWheelEvent> #include <QtGui/QMouseEvent> #include <QtGui/QClipboard> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QGraphicsObject> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QGraphicsObject> #include <QtQuick1/QDeclarativeItem> #include <QtDeclarative/QDeclarativeEngine> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h b/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h index e41d70a61b..72c74663a1 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h @@ -42,7 +42,7 @@ #ifndef SUBCOMPONENTMASKLAYERITEM_H #define SUBCOMPONENTMASKLAYERITEM_H -#include <QtGui/QGraphicsPolygonItem> +#include <QtWidgets/QGraphicsPolygonItem> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp index 091466284f..64d4035d09 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp @@ -45,12 +45,12 @@ #include <QtGui/QPixmap> #include <QtGui/QPainter> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QtGui/QContextMenuEvent> #include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QColorDialog> +#include <QtWidgets/QApplication> +#include <QtWidgets/QColorDialog> #include <QtGui/QDrag> #include <QtCore/QMimeData> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h b/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h index 8ef75a4114..ce5ecf0e7e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.h @@ -42,7 +42,7 @@ #ifndef TOOLBARCOLORBOX_H #define TOOLBARCOLORBOX_H -#include <QtGui/QLabel> +#include <QtWidgets/QLabel> #include <QtGui/QColor> #include <QtCore/QPoint> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp index c8ade825a2..1aad9c351b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp @@ -46,8 +46,8 @@ #include <QtGui/QMouseEvent> #include <QtGui/QWheelEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QtCore/QRectF> #include <QtCore/QDebug> diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp index bef218ca6b..f97ce010ba 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp @@ -52,9 +52,9 @@ #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeContext> #include <QtDeclarative/QDeclarativeExpression> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/QMouseEvent> -#include <QtGui/QGraphicsObject> +#include <QtWidgets/QGraphicsObject> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 7f4d54e53a..d547422cb0 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qmldbg_inspector -QT += declarative-private core-private gui-private opengl-private qtquick1 +QT += declarative-private core-private gui-private opengl-private qtquick1 widgets widgets-private load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp index 36e2818674..653c059d53 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp @@ -44,7 +44,7 @@ #include "sghighlight.h" #include "sgviewinspector.h" -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QMouseEvent> #include <QtDeclarative/QSGView> #include <QtDeclarative/QSGItem> diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 46d31739ee..c553070123 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -43,7 +43,7 @@ #include <QtDeclarative/private/qdeclarativemetatype_p.h> #include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtCore/QSet> #include <QtCore/QMetaObject> diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp index ca1593225c..c5b94abac7 100644 --- a/tools/qmlviewer/qmlruntime.cpp +++ b/tools/qmlviewer/qmlruntime.cpp @@ -1426,9 +1426,9 @@ void QDeclarativeViewer::recordFrame() if (frame_fmt == QLatin1String(".gif")) { // ffmpeg can't do 32bpp with gif QImage rgb24 = frame.convertToFormat(QImage::Format_RGB888); - frame_stream->write((char*)rgb24.bits(),rgb24.numBytes()); + frame_stream->write((char*)rgb24.bits(),rgb24.byteCount()); } else { - frame_stream->write((char*)frame.bits(),frame.numBytes()); + frame_stream->write((char*)frame.bits(),frame.byteCount()); } } else { frames.append(new QImage(frame)); diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 16579bb167..8dc5808ad5 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG += qt uic DESTDIR = ../../bin -QT += declarative qtquick1 qtquick1-private +QT += declarative qtquick1 qtquick1-private widgets widgets-private include(qml.pri) @@ -10,6 +10,7 @@ SOURCES += main.cpp INCLUDEPATH += ../../include/QtDeclarative INCLUDEPATH += ../../src/declarative/util INCLUDEPATH += ../../src/declarative/graphicsitems +INCLUDEPATH += ../../src/3rdparty/v8/include DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII |