diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-07-29 18:32:58 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-01 07:33:56 +0200 |
| commit | a61337b33ae1a3ee2df1570da30880e8fe9237e9 (patch) | |
| tree | a9ec82d53e4e7b0e40e8ce4712dd4acf16b8019c /tools | |
| parent | 68c74921dfe30a147c8350c03b3f8f41942cb09c (diff) | |
Compile with refactor
Change-Id: I41119370bd4823dcdfe5d4e2521d18b8d6ba8be3
Reviewed-on: http://codereview.qt.nokia.com/2417
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlviewer/qmlruntime.cpp | 4 | ||||
| -rw-r--r-- | tools/qmlviewer/qmlviewer.pro | 3 |
3 files changed, 5 insertions, 4 deletions
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 |