Compile

3 files changed, 3 insertions, 8 deletions

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 448437c..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,7 +75,6 @@ int main(int argc, char ** argv)
     QString skin;
     bool devkeys = false;
     bool cache = false;
-    QString testDir;
     QString translationFile;
 
     for (int i = 1; i < argc; ++i) {
@@ -126,7 +124,7 @@ int main(int argc, char ** argv)
         app.installTranslator(&qmlTranslator);
     }
 
-    QmlViewer viewer(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 c8b4250..19866cc 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -19,7 +19,6 @@
 #include <QtDeclarative/qmlengine.h>
 #include "qml.h"
 #include "qperformancelog.h"
-#include "qfxtestengine.h"
 #include "deviceskin.h"
 
 #include <QNetworkDiskCache>
@@ -125,7 +124,7 @@ void PreviewDeviceSkin::slotPopupMenu()
 }
 
 
-QmlViewer::QmlViewer(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)
 {
     devicemode = false;
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index d97760f..22f07a0 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>
 
 
@@ -30,7 +29,7 @@ class QmlViewer : public QWidget
 {
 Q_OBJECT
 public:
-    QmlViewer(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);
@@ -74,7 +73,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;