summaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qmlviewer')
-rw-r--r--tools/qmlviewer/main.cpp17
-rw-r--r--tools/qmlviewer/qmlviewer.cpp30
-rw-r--r--tools/qmlviewer/qmlviewer.h6
3 files changed, 11 insertions, 42 deletions
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 0b370fb..db0a28f 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -15,7 +15,6 @@
#include "qmlviewer.h"
#include <QWidget>
#include <QDir>
-#include "qfxtestengine.h"
#include <QApplication>
#include <QTranslator>
#include <QDebug>
@@ -76,8 +75,6 @@ int main(int argc, char ** argv)
QString skin;
bool devkeys = false;
bool cache = false;
- QFxTestEngine::TestMode testMode = QFxTestEngine::NoTest;
- QString testDir;
QString translationFile;
for (int i = 1; i < argc; ++i) {
@@ -104,18 +101,6 @@ int main(int argc, char ** argv)
autorecord_to = range.mid(dash+1).toInt();
} else if (arg == "-devicekeys") {
devkeys = true;
- } else if (arg == "-recordtest") {
- testMode = QFxTestEngine::RecordTest;
- if(i + 1 >= argc)
- usage();
- testDir = argv[i + 1];
- ++i;
- } else if (arg == "-runtest") {
- testMode = QFxTestEngine::PlaybackTest;
- if(i + 1 >= argc)
- usage();
- testDir = argv[i + 1];
- ++i;
} else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
fprintf(stderr, "Qt Declarative UI Viewer version %s\n", QT_VERSION_STR);
return 0;
@@ -139,7 +124,7 @@ int main(int argc, char ** argv)
app.installTranslator(&qmlTranslator);
}
- QmlViewer viewer(testMode, testDir, 0, frameless ? Qt::FramelessWindowHint : Qt::Widget);
+ QmlViewer viewer(0, frameless ? Qt::FramelessWindowHint : Qt::Widget);
foreach (QString lib, libraries)
viewer.addLibraryPath(lib);
viewer.setCacheEnabled(cache);
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index db0dc18..d489412 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -19,7 +19,6 @@
#include <QtDeclarative/qmlengine.h>
#include "qml.h"
#include <private/qperformancelog_p.h>
-#include "qfxtestengine.h"
#include "deviceskin.h"
#include <QNetworkDiskCache>
@@ -40,6 +39,7 @@
#include <QFileDialog>
#include <QTimer>
#include <QNetworkProxyFactory>
+#include <QKeyEvent>
QT_BEGIN_NAMESPACE
@@ -126,10 +126,9 @@ void PreviewDeviceSkin::slotPopupMenu()
}
-QmlViewer::QmlViewer(QFxTestEngine::TestMode testMode, const QString &testDir, QWidget *parent, Qt::WindowFlags flags)
+QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
: QWidget(parent, flags), frame_stream(0), scaleSkin(true), mb(0)
{
- testEngine = 0;
devicemode = false;
skin = 0;
canvas = 0;
@@ -144,9 +143,6 @@ QmlViewer::QmlViewer(QFxTestEngine::TestMode testMode, const QString &testDir, Q
canvas->setAttribute(Qt::WA_NoSystemBackground);
canvas->setContentResizable(!skin || !scaleSkin);
- if(testMode != QFxTestEngine::NoTest)
- testEngine = new QFxTestEngine(testMode, testDir, canvas, this);
-
QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
QVBoxLayout *layout = new QVBoxLayout;
@@ -296,7 +292,8 @@ void QmlViewer::takeSnapShot()
{
static int snapshotcount = 1;
QString snapFileName = QString(QLatin1String("snapshot%1.png")).arg(snapshotcount);
- canvas->asImage().save(snapFileName);
+ // ### GV
+ // canvas->asImage().save(snapFileName);
qDebug() << "Wrote" << snapFileName;
++snapshotcount;
}
@@ -518,22 +515,11 @@ void QmlViewer::keyPressEvent(QKeyEvent *event)
toggleRecording();
} else if (event->key() == Qt::Key_F3 || (event->key() == Qt::Key_3 && devicemode)) {
takeSnapShot();
- } else if (event->key() == Qt::Key_F4 || (event->key() == Qt::Key_4 && devicemode)) {
- canvas->dumpItems();
- canvas->checkState();
} else if (event->key() == Qt::Key_F5 || (event->key() == Qt::Key_5 && devicemode)) {
reload();
- } else if (event->key() == Qt::Key_F6 || (event->key() == Qt::Key_6 && devicemode)) {
- canvas->dumpRoot();
- } else if (event->key() == Qt::Key_F7 || (event->key() == Qt::Key_7 && devicemode)) {
- canvas->dumpTiming();
} else if (event->key() == Qt::Key_F8 || (event->key() == Qt::Key_8 && devicemode)) {
QPerformanceLog::displayData();
QPerformanceLog::clear();
- } else if (event->key() == Qt::Key_F9) {
- if(testEngine) testEngine->save();
- } else if (event->key() == Qt::Key_F10) {
- if(testEngine) testEngine->captureFullFrame();
}
QWidget::keyPressEvent(event);
@@ -661,10 +647,12 @@ void QmlViewer::timerEvent(QTimerEvent *event)
{
if (event->timerId() == recordTimer.timerId()) {
if (frame_stream) {
- QImage frame(canvas->asImage());
- frame_stream->write((char*)frame.bits(),frame.numBytes());
+ // ### GV
+ // QImage frame(canvas->asImage());
+ // frame_stream->write((char*)frame.bits(),frame.numBytes());
} else {
- frames.append(new QImage(canvas->asImage()));
+ // ### GV
+ // frames.append(new QImage(canvas->asImage()));
}
if (record_autotime && autoTimer.elapsed() >= record_autotime)
setRecording(false);
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index c533fe0..c46f185 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -17,7 +17,6 @@
#include <QMenuBar>
#include <QBasicTimer>
#include <QTime>
-#include <qfxtestengine.h>
#include <QList>
QT_BEGIN_NAMESPACE
@@ -31,7 +30,7 @@ class QmlViewer : public QWidget
{
Q_OBJECT
public:
- QmlViewer(QFxTestEngine::TestMode = QFxTestEngine::NoTest, const QString &testDir = QString(), QWidget *parent=0, Qt::WindowFlags flags=0);
+ QmlViewer(QWidget *parent=0, Qt::WindowFlags flags=0);
void setRecordDither(const QString& s) { record_dither = s; }
void setRecordPeriod(int ms);
@@ -75,7 +74,6 @@ private:
PreviewDeviceSkin *skin;
QSize skinscreensize;
QFxView *canvas;
- void init(QFxTestEngine::TestMode, const QString &, const QString& fileName);
QBasicTimer recordTimer;
QList<QImage*> frames;
QProcess* frame_stream;
@@ -91,8 +89,6 @@ private:
QString currentSkin;
bool scaleSkin;
mutable QMenuBar *mb;
-
- QFxTestEngine *testEngine;
};
QT_END_NAMESPACE
generated by cgit v0.12 at 2024-10-22 08:28:29 (GMT)