aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlplugindump/main.cpp2
-rw-r--r--tools/qmlscene/main.cpp110
-rw-r--r--tools/qmlviewer/qmlruntime.cpp4
-rw-r--r--tools/qmlviewer/qmlviewer.pro3
-rw-r--r--tools/tools.pro4
5 files changed, 36 insertions, 87 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/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 1d3641b61e..95b1059943 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -41,19 +41,19 @@
#include <QtCore/qdebug.h>
#include <QtCore/qabstractanimation.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativeengine.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtQuick1/qdeclarativeview.h>
#include <QtCore/qdir.h>
-#include <QtGui/QFormLayout>
-#include <QtGui/QComboBox>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QFileDialog>
-#include <QtGui/QGraphicsView>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QGraphicsView>
#include <QtDeclarative/qdeclarativecontext.h>
#include <private/qdeclarativedebughelper_p.h>
@@ -144,36 +144,13 @@ void RenderStatistics::printTotalStats()
}
#endif
-
-static QGLFormat getFormat()
-{
- QGLFormat f = QGLFormat::defaultFormat();
- f.setSampleBuffers(!qApp->arguments().contains("--no-multisample"));
- f.setSwapInterval(qApp->arguments().contains("--nonblocking-swap") ? 0 : 1);
- f.setStereo(qApp->arguments().contains("--stereo"));
- return f;
-}
-
class MyQSGView : public QSGView
{
public:
- MyQSGView() : QSGView(getFormat())
+ MyQSGView() : QSGView()
{
setResizeMode(QSGView::SizeRootObjectToView);
}
-
-protected:
- void paintEvent(QPaintEvent *e) {
- QSGView::paintEvent(e);
-
-#ifdef QML_RUNTIME_TESTING
-// RenderStatistics::updateStats();
-#endif
-
- static bool continuousUpdate = qApp->arguments().contains("--continuous-update");
- if (continuousUpdate)
- update();
- }
};
class MyDeclarativeView: public QDeclarativeView
@@ -183,20 +160,6 @@ public:
{
setResizeMode(QDeclarativeView::SizeRootObjectToView);
}
-
-protected:
- void paintEvent(QPaintEvent *event)
- {
- QDeclarativeView::paintEvent(event);
-
-#ifdef QML_RUNTIME_TESTING
- RenderStatistics::updateStats();
-#endif
-
- static bool continuousUpdate = qApp->arguments().contains("--continuous-update");
- if (continuousUpdate)
- scene()->update();
- }
};
#ifndef QT_NO_SCENEGRAPHITEM
@@ -499,7 +462,7 @@ int main(int argc, char ** argv)
displayFileDialog(&options);
#endif
- QWidget *view = 0;
+ QWindow *window = 0;
QDeclarativeEngine *engine = 0;
int exitCode = 0;
@@ -520,54 +483,37 @@ int main(int argc, char ** argv)
item->setSource(options.file);
} else
#endif
- if (!options.originalQml && !options.originalQmlRaster) {
- if (options.versionDetection)
- checkAndAdaptVersion(options.file);
- QSGView *qxView = new MyQSGView();
- qxView->setVSyncAnimations(options.vsync);
- engine = qxView->engine();
- for (int i = 0; i < imports.size(); ++i)
- engine->addImportPath(imports.at(i));
- view = qxView;
- if (options.file.isLocalFile()) {
- QFileInfo fi(options.file.toLocalFile());
- loadDummyDataFiles(*engine, fi.path());
- }
- qxView->setSource(options.file);
-
- } else {
- MyDeclarativeView *gvView = new MyDeclarativeView();
- engine = gvView->engine();
- for (int i = 0; i < imports.size(); ++i)
- engine->addImportPath(imports.at(i));
- view = gvView;
- if (options.file.isLocalFile()) {
- QFileInfo fi(options.file.toLocalFile());
- loadDummyDataFiles(*engine, fi.path());
- }
- gvView->setSource(options.file);
- if (!options.originalQmlRaster) {
- QGLWidget *viewport = new QGLWidget(getFormat());
- gvView->setViewport(viewport);
- }
+ if (options.versionDetection)
+ checkAndAdaptVersion(options.file);
+ QSGView *qxView = new MyQSGView();
+ qxView->setVSyncAnimations(options.vsync);
+ engine = qxView->engine();
+ for (int i = 0; i < imports.size(); ++i)
+ engine->addImportPath(imports.at(i));
+ window = qxView;
+ if (options.file.isLocalFile()) {
+ QFileInfo fi(options.file.toLocalFile());
+ loadDummyDataFiles(*engine, fi.path());
}
+ qxView->setSource(options.file);
QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
if (options.fullscreen)
- view->showFullScreen();
+ window->showFullScreen();
else if (options.maximized)
- view->showMaximized();
+ window->showMaximized();
else
- view->show();
+ window->show();
+
#ifdef Q_WS_MAC
- view->raise();
+ window->raise();
#endif
exitCode = app.exec();
- delete view;
+ delete window;
#ifdef QML_RUNTIME_TESTING
RenderStatistics::printTotalStats();
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
diff --git a/tools/tools.pro b/tools/tools.pro
index dccdce8160..29340c61b0 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,4 +1,6 @@
TEMPLATE = subdirs
SUBDIRS += qmlviewer qmlscene qmlplugindump
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner
+
+# ### refactor: port properly
+# contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 21:00:35 +0000