summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/debugger/qmlcanvasdebugger.cpp4
-rw-r--r--src/declarative/debugger/qmldebugger.cpp20
-rw-r--r--src/declarative/debugger/qmlobjecttree.cpp4
-rw-r--r--src/declarative/debugger/qmlpropertyview.cpp2
-rw-r--r--src/declarative/fx/qfxitem.cpp8
-rw-r--r--src/declarative/fx/qfxpathview.cpp1
-rw-r--r--src/declarative/fx/qfxtext.cpp1
-rw-r--r--src/declarative/fx/qfxvisualitemmodel.cpp2
-rw-r--r--src/declarative/qml/qmlcompositetypemanager.cpp4
-rw-r--r--src/declarative/qml/qmlcontext.cpp2
-rw-r--r--src/declarative/qml/qmlcustomparser.cpp1
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp13
-rw-r--r--src/declarative/test/qfxtestengine.cpp54
-rw-r--r--src/declarative/test/qfxtestobjects.cpp84
-rw-r--r--src/declarative/test/qfxtestobjects.h12
-rw-r--r--src/declarative/test/qfxtestview.cpp3
16 files changed, 117 insertions, 98 deletions
diff --git a/src/declarative/debugger/qmlcanvasdebugger.cpp b/src/declarative/debugger/qmlcanvasdebugger.cpp
index fe57bf4..21abd2d 100644
--- a/src/declarative/debugger/qmlcanvasdebugger.cpp
+++ b/src/declarative/debugger/qmlcanvasdebugger.cpp
@@ -76,7 +76,7 @@ QmlCanvasDebugger::QmlCanvasDebugger(QmlWatches *w, QWidget *parent)
QObject::connect(y, SIGNAL(valueChanged(int)), this, SLOT(setY(int)));
hlayout->addWidget(x);
hlayout->addWidget(y);
- QPushButton *pb = new QPushButton("Refresh", this);
+ QPushButton *pb = new QPushButton(tr("Refresh"), this);
QObject::connect(pb, SIGNAL(clicked()), this, SLOT(refresh()));
hlayout->addWidget(pb);
@@ -233,7 +233,7 @@ void QmlCanvasDebugger::setCanvas(QSimpleCanvas *canvas)
return;
QTreeWidgetItem *root = new QmlCanvasDebuggerItem(m_tree);
- root->setText(0, "Root");
+ root->setText(0, tr("Root"));
root->setExpanded(true);
clone(root, m_canvasRoot, m_debugCanvas->root());
}
diff --git a/src/declarative/debugger/qmldebugger.cpp b/src/declarative/debugger/qmldebugger.cpp
index 49ad8d9..0bbcb2c 100644
--- a/src/declarative/debugger/qmldebugger.cpp
+++ b/src/declarative/debugger/qmldebugger.cpp
@@ -85,7 +85,7 @@ QmlDebugger::QmlDebugger(QWidget *parent)
QObject::connect(m_tree, SIGNAL(addWatch(QObject*,QString)), this, SLOT(addWatch(QObject*,QString)));
vlayout->addWidget(m_tree);
- QPushButton *pb = new QPushButton("Refresh", treeWid);
+ QPushButton *pb = new QPushButton(tr("Refresh"), treeWid);
QObject::connect(pb, SIGNAL(clicked()), this, SLOT(refresh()));
vlayout->addWidget(pb);
@@ -93,28 +93,28 @@ QmlDebugger::QmlDebugger(QWidget *parent)
m_text = new QPlainTextEdit(this);
m_text->setReadOnly(true);
- tabs->addTab(m_text, "File");
+ tabs->addTab(m_text, tr("File"));
m_warnings = new QTreeWidget(this);
m_warnings->setHeaderHidden(true);
- tabs->addTab(m_warnings, "Warnings");
+ tabs->addTab(m_warnings, tr("Warnings"));
m_watches = new QmlWatches(this);
m_watchTable = new QTableView(this);
m_watchTable->setSelectionMode(QTableWidget::NoSelection);
m_watchTable->setModel(m_watches);
- tabs->addTab(m_watchTable, "Watches");
+ tabs->addTab(m_watchTable, tr("Watches"));
m_properties = new QmlPropertyView(m_watches, this);
QObject::connect(m_properties, SIGNAL(objectClicked(quint32)),
this, SLOT(highlightObject(quint32)));
- tabs->addTab(m_properties, "Properties");
+ tabs->addTab(m_properties, tr("Properties"));
tabs->setCurrentWidget(m_properties);
m_canvas = new QmlCanvasDebugger(m_watches, this);
QObject::connect(m_canvas, SIGNAL(objectClicked(quint32)),
this, SLOT(highlightObject(quint32)));
- tabs->addTab(m_canvas, "Canvas");
+ tabs->addTab(m_canvas, tr("Canvas"));
splitter->addWidget(tabs);
splitter->setStretchFactor(1, 2);
@@ -229,7 +229,7 @@ bool QmlDebugger::makeItem(QObject *obj, QmlDebuggerItem *item)
if(QmlBindableValue *bv = qobject_cast<QmlBindableValue *>(obj)) {
QmlExpressionPrivate *p = bv->d;
- text = bv->property().name() + ": " + bv->expression();
+ text = bv->property().name() + QLatin1String(": ") + bv->expression();
item->setForeground(0, Qt::green);
item->bindableValue = bv;
@@ -281,13 +281,13 @@ bool QmlDebugger::makeItem(QObject *obj, QmlDebuggerItem *item)
QString toolTipString;
if(!p->url.toString().isEmpty()) {
item->url = p->url;
- toolTipString = "URL: " + p->url.toString();
+ toolTipString = QLatin1String("URL: ") + p->url.toString();
}
if(!p->typeName.isEmpty()) {
if(!toolTipString.isEmpty())
- toolTipString.prepend("\n");
- toolTipString.prepend("Root type: " + text);
+ toolTipString.prepend(QLatin1Char('\n'));
+ toolTipString.prepend(tr("Root type: ") + text);
text = p->typeName;
}
diff --git a/src/declarative/debugger/qmlobjecttree.cpp b/src/declarative/debugger/qmlobjecttree.cpp
index fb6825a..27dc000 100644
--- a/src/declarative/debugger/qmlobjecttree.cpp
+++ b/src/declarative/debugger/qmlobjecttree.cpp
@@ -57,7 +57,7 @@ void QmlObjectTree::mousePressEvent(QMouseEvent *me)
{
QTreeWidget::mousePressEvent(me);
if(me->button() == Qt::RightButton && me->type() == QEvent::MouseButtonPress) {
- QAction action("Add watch...", 0);
+ QAction action(tr("Add watch..."), 0);
QList<QAction *> actions;
actions << &action;
QmlDebuggerItem *item = static_cast<QmlDebuggerItem *>(currentItem());
@@ -65,7 +65,7 @@ void QmlObjectTree::mousePressEvent(QMouseEvent *me)
QMenu::exec(actions, me->globalPos())) {
bool ok = false;
- QString watch = QInputDialog::getText(this, "Watch expression", "Expression:", QLineEdit::Normal, QString(), &ok);
+ QString watch = QInputDialog::getText(this, tr("Watch expression"), tr("Expression:"), QLineEdit::Normal, QString(), &ok);
if(ok && !watch.isEmpty())
emit addWatch(item->object, watch);
diff --git a/src/declarative/debugger/qmlpropertyview.cpp b/src/declarative/debugger/qmlpropertyview.cpp
index e32393c..0d34fd9 100644
--- a/src/declarative/debugger/qmlpropertyview.cpp
+++ b/src/declarative/debugger/qmlpropertyview.cpp
@@ -56,7 +56,7 @@ QmlPropertyView::QmlPropertyView(QmlWatches *watches, QWidget *parent)
setLayout(layout);
m_tree = new QTreeWidget(this);
- m_tree->setHeaderLabels(QStringList() << "Property" << "Value");
+ m_tree->setHeaderLabels(QStringList() << tr("Property") << tr("Value"));
QObject::connect(m_tree, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
this, SLOT(itemDoubleClicked(QTreeWidgetItem *)));
QObject::connect(m_tree, SIGNAL(itemClicked(QTreeWidgetItem *, int)),
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 561a124..3e29f13 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -197,8 +197,10 @@ void QFxContents::setItem(QFxItem *item)
const QList<QSimpleCanvasItem *> &children = _item->QSimpleCanvasItem::children();
for (int i = 0; i < children.count(); ++i) {
const QSimpleCanvasItem *child = children.at(i);
- connect(child, SIGNAL(bottomChanged()), this, SLOT(calcHeight()));
- connect(child, SIGNAL(rightChanged()), this, SLOT(calcWidth()));
+ connect(child, SIGNAL(heightChanged()), this, SLOT(calcHeight()));
+ connect(child, SIGNAL(topChanged()), this, SLOT(calcHeight()));
+ connect(child, SIGNAL(widthChanged()), this, SLOT(calcWidth()));
+ connect(child, SIGNAL(leftChanged()), this, SLOT(calcWidth()));
}
calcHeight();
@@ -1661,6 +1663,7 @@ void QFxItem::setKeepMouseGrab(bool keep)
*/
void QFxItem::activeFocusChanged(bool flag)
{
+ Q_UNUSED(flag);
emit activeFocusChanged();
}
@@ -1670,6 +1673,7 @@ void QFxItem::activeFocusChanged(bool flag)
*/
void QFxItem::focusChanged(bool flag)
{
+ Q_UNUSED(flag);
emit focusChanged();
}
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index e315547..3f2e77a 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -744,6 +744,7 @@ void QFxPathView::createdItem(int index, QFxItem *item)
void QFxPathView::destroyingItem(QFxItem *item)
{
+ Q_UNUSED(item);
}
void QFxPathView::ticked()
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index 2542413..315b451 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -603,7 +603,6 @@ QSize QFxTextPrivate::setupTextLayout(QTextLayout *layout)
QImage QFxTextPrivate::wrappedTextImage(bool drawStyle)
{
//do layout
- Q_Q(const QFxText);
QFont f; if (_font) f = _font->font();
QSize size = cachedLayoutSize;
diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp
index b9ddcb9..039998a 100644
--- a/src/declarative/fx/qfxvisualitemmodel.cpp
+++ b/src/declarative/fx/qfxvisualitemmodel.cpp
@@ -621,7 +621,7 @@ QVariant QFxVisualItemModel::evaluate(int index, const QString &expression, QObj
int QFxVisualItemModel::indexOf(QFxItem *item, QObject *objectContext) const
{
- QmlExpression e(qmlContext(item), "index", objectContext);
+ QmlExpression e(qmlContext(item), QLatin1String("index"), objectContext);
e.setTrackChange(false);
QVariant value = e.value();
if (value.isValid())
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index e1124a6..0da1a92 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -315,7 +315,7 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit)
continue;
}
- QUrl url = engine->componentUrl(QUrl(type + ".qml"), QUrl(unit->url));
+ QUrl url = engine->componentUrl(QUrl(QLatin1String(type + ".qml")), QUrl(unit->url));
QmlCompositeTypeData *urlUnit = components.value(url.toString());
if (!urlUnit) {
@@ -335,7 +335,7 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit)
{
QmlError error;
error.setUrl(unit->url);
- error.setDescription("Type " + type + " unavailable");
+ error.setDescription(tr("Type %1 unavailable").arg(QLatin1String(type)));
unit->errors << error;
}
if (urlUnit->errorType != QmlCompositeTypeData::AccessError)
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index ea72ebf..e5016f2 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -73,8 +73,6 @@ void QmlContextPrivate::dump(int depth)
void QmlContextPrivate::destroyed(QObject *obj)
{
- Q_Q(QmlContext);
-
defaultObjects.removeAll(obj);
QVariant variantObject = QVariant::fromValue(obj);
diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp
index a60f783..2e8c8f6 100644
--- a/src/declarative/qml/qmlcustomparser.cpp
+++ b/src/declarative/qml/qmlcustomparser.cpp
@@ -224,6 +224,7 @@ QList<QVariant> QmlCustomParserProperty::assignedValues() const
QByteArray QmlCustomParser::compile(const QList<QmlCustomParserProperty> &, bool *ok)
{
+ Q_UNUSED(ok);
return QByteArray();
}
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 01600b9..5b3564f 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -10,6 +10,7 @@
#include "parser/javascriptast_p.h"
#include <QStack>
+#include <QCoreApplication>
#include <QtDebug>
#include <qfxperf.h>
@@ -207,8 +208,8 @@ ProcessAST::defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
{
int lastTypeDot = objectType.lastIndexOf(QLatin1Char('.'));
bool isType = !objectType.isEmpty() &&
- (objectType.at(0).isUpper() |
- lastTypeDot >= 0 && objectType.at(lastTypeDot+1).isUpper());
+ (objectType.at(0).isUpper() ||
+ (lastTypeDot >= 0 && objectType.at(lastTypeDot+1).isUpper()));
int propertyCount = 0;
for (; propertyName; propertyName = propertyName->next){
@@ -221,7 +222,7 @@ ProcessAST::defineObjectBinding_helper(AST::UiQualifiedId *propertyName,
if(propertyCount || !currentObject()) {
QmlError error;
- error.setDescription("Expected type name");
+ error.setDescription(QCoreApplication::translate("QmlParser","Expected type name"));
error.setLine(typeLocation.startLine);
error.setColumn(typeLocation.startColumn);
_parser->_errors << error;
@@ -427,7 +428,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
if(!typeFound) {
QmlError error;
- error.setDescription("Expected property type");
+ error.setDescription(QCoreApplication::translate("QmlParser","Expected property type"));
error.setLine(node->typeToken.startLine);
error.setColumn(node->typeToken.startColumn);
_parser->_errors << error;
@@ -573,7 +574,7 @@ bool ProcessAST::visit(AST::UiSourceElement *node)
if(funDecl->formals) {
QmlError error;
- error.setDescription("Slot declarations must be parameterless");
+ error.setDescription(QCoreApplication::translate("QmlParser","Slot declarations must be parameterless"));
error.setLine(funDecl->lparenToken.startLine);
error.setColumn(funDecl->lparenToken.startColumn);
_parser->_errors << error;
@@ -587,7 +588,7 @@ bool ProcessAST::visit(AST::UiSourceElement *node)
obj->dynamicSlots << slot;
} else {
QmlError error;
- error.setDescription("JavaScript declaration outside Script element");
+ error.setDescription(QCoreApplication::translate("QmlParser","JavaScript declaration outside Script element"));
error.setLine(node->firstSourceLocation().startLine);
error.setColumn(node->firstSourceLocation().startColumn);
_parser->_errors << error;
diff --git a/src/declarative/test/qfxtestengine.cpp b/src/declarative/test/qfxtestengine.cpp
index 70e600d..0d7e5df 100644
--- a/src/declarative/test/qfxtestengine.cpp
+++ b/src/declarative/test/qfxtestengine.cpp
@@ -62,7 +62,7 @@ class QFxTestEnginePrivate : public QAbstractAnimation
{
public:
QFxTestEnginePrivate(QFxTestEngine *p)
- : q(p), canvas(0), testMode(QFxTestEngine::NoTest), fullFrame(true),
+ : q(p), canvas(0), testMode(QFxTestEngine::NoTest), fullFrame(true),
status(Working), exitOnFail(true), mismatchedFrames(0),
lastFrameMismatch(false) {}
@@ -106,20 +106,25 @@ public:
bool compare(const QImage &img1, const QImage &img2);
virtual int duration() const { return -1; }
+
+ int elapsed() { return currentTime(); }
};
bool QFxTestEnginePrivate::compare(const QImage &img1, const QImage &img2)
{
- if (img1.size() != img2.size())
+ if (img1.size() != img2.size()) {
+ qWarning() << "Image size mismatch" << img1.size() << img2.size();
return false;
+ }
int errorCount = 0;
for (int yy = 0; yy < img1.height(); ++yy) {
for (int xx = 0; xx < img1.width(); ++xx) {
if (img1.pixel(xx, yy) != img2.pixel(xx, yy)) {
errorCount++;
- if (errorCount > MAX_MISMATCHED_PIXELS)
+ if (errorCount > MAX_MISMATCHED_PIXELS) {
return false;
+ }
}
}
}
@@ -142,7 +147,7 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir,
qWarning("QFxTestEngine: Record ON");
} else if (d->testMode == PlaybackTest) {
- QString fileName(d->testDirectory + QLatin1String("/manifest.xml"));
+ QString fileName(d->testDirectory + QLatin1String("/manifest.qml"));
QFile f(fileName);
if (!f.open(QIODevice::ReadOnly)) {
qWarning() << "QFxTestEngine: Unable to open file" << fileName;
@@ -150,13 +155,13 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir,
}
QByteArray data = f.readAll();
- QmlComponent c(&d->engine, data, QUrl(d->testDirectory + QLatin1String("/manifest.xml")));
+ QmlComponent c(&d->engine, data, QUrl(d->testDirectory + QLatin1String("/manifest.qml")));
QObject *o = c.create();
TestLog *log = qobject_cast<TestLog *>(o);
if (log) {
log->setParent(this);
d->playbackTestData.actions() = log->actions();
- qWarning("QFxTestEngine: Playback ON");
+ qWarning() << "QFxTestEngine: Playback ON," << d->playbackTestData.actions().count() << "actions";
} else {
delete o;
qWarning() << "QFxTestEngine: File" << fileName << "is corrupt.";
@@ -165,7 +170,6 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir,
}
if (d->testMode != NoTest) {
-
QUnifiedTimer::instance()->setConsistentTiming(true);
QObject::connect(canvas, SIGNAL(framePainted()),
this, SLOT(framePainted()));
@@ -173,7 +177,7 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir,
canvas->installEventFilter(this);
for (int ii = 0; ii < d->playbackTestData.actions().count(); ++ii) {
TestObject *o = d->playbackTestData.actions().at(ii);
- if (TestMouse *m = qobject_cast<TestMouse *>(o))
+ if (TestMouse *m = qobject_cast<TestMouse *>(o))
d->toPost << m;
else if (TestKey *k = qobject_cast<TestKey *>(o))
d->toPost << k;
@@ -201,7 +205,7 @@ void QFxTestEngine::framePainted()
void QFxTestEnginePrivate::recordFullFrameEvent(const QImage &img)
{
TestFullFrame *ff = new TestFullFrame(q);
- ff->setTime(QUnifiedTimer::instance()->elapsedTime());
+ ff->setTime(elapsed());
ff->setFrameId(fullFrames.count());
fullFrames << img;
@@ -211,7 +215,8 @@ void QFxTestEnginePrivate::recordFullFrameEvent(const QImage &img)
TestFullFrame *pf = qobject_cast<TestFullFrame *>(playbackTestData.next());
QString filename = testDirectory + QLatin1String("/image") + QString::number(pf->frameId()) + QLatin1String(".png");
QImage recImg(filename);
- if (!pf || !compare(recImg, img) || pf->time() != QUnifiedTimer::instance()->elapsedTime()) {
+ if (!pf || !compare(recImg, img) || pf->time() != elapsed()) {
+ qDebug() << pf << pf->time() << elapsed();
message(Fail, "FFrame mismatch");
} else {
message(Success, "FFrame OK");
@@ -249,14 +254,14 @@ void QFxTestEnginePrivate::recordFrameEvent(const QImage &img)
hexResult.append(toHex(result.at(ii)));
TestFrame *f = new TestFrame(q);
- f->setTime(QUnifiedTimer::instance()->elapsedTime());
+ f->setTime(elapsed());
f->setHash(QLatin1String(hexResult));
testData.actions() << f;
if (testMode == QFxTestEngine::PlaybackTest) {
TestObject *o = playbackTestData.next();
TestFrame *f = qobject_cast<TestFrame *>(o);
- if (!f || f->time() != QUnifiedTimer::instance()->elapsedTime() ||
+ if (!f || f->time() != elapsed() ||
f->hash() != QLatin1String(hexResult)) {
mismatchedFrames++;
if (mismatchedFrames > MAX_MISMATCHED_FRAMES ||
@@ -280,14 +285,13 @@ void QFxTestEnginePrivate::updateCurrentTime(int)
return;
while(!toPost.isEmpty()) {
- int t = QUnifiedTimer::instance()->elapsedTime();
+ int t = elapsed();
TestObject *o = toPost.first();
if (testMode == QFxTestEngine::RecordTest)
o->setTime(t);
else if (o->time() != t)
return;
toPost.takeFirst();
-
if (TestMouse *m = qobject_cast<TestMouse *>(o)) {
QMouseEvent e((QEvent::Type)m->type(), m->pos(), m->globalPos(), (Qt::MouseButton)m->button(), (Qt::MouseButtons)m->buttons(), (Qt::KeyboardModifiers)0);
postedEvents.insert(&e);
@@ -336,7 +340,7 @@ bool QFxTestEngine::eventFilter(QObject *, QEvent *event)
void QFxTestEnginePrivate::recordMouseEvent(QMouseEvent *e)
{
TestMouse *m = new TestMouse(q);
- m->setTime(QUnifiedTimer::instance()->elapsedTime());
+ m->setTime(elapsed());
m->setType(e->type());
m->setButton(e->button());
m->setButtons(e->buttons());
@@ -346,14 +350,16 @@ void QFxTestEnginePrivate::recordMouseEvent(QMouseEvent *e)
if (testMode == QFxTestEngine::PlaybackTest) {
TestMouse *m = qobject_cast<TestMouse *>(playbackTestData.next());
- if (!m || m->time() != QUnifiedTimer::instance()->elapsedTime() ||
+ if (!m || m->time() != elapsed() ||
m->type() != e->type() ||
m->button() != e->button() ||
m->buttons() != e->buttons() ||
- m->globalPos() != e->globalPos() ||
- m->pos() != e->pos())
+// m->globalPos() != e->globalPos() ||
+ m->pos() != e->pos()) {
+ if (m)
+ qWarning() << m->time() << elapsed();
message(Fail, "Mouse mismatch");
- else
+ } else
message(Success, "Mouse OK");
testPass();
@@ -366,7 +372,7 @@ void QFxTestEnginePrivate::recordMouseEvent(QMouseEvent *e)
void QFxTestEnginePrivate::recordKeyEvent(QKeyEvent *e)
{
TestKey *k = new TestKey(q);
- k->setTime(QUnifiedTimer::instance()->elapsedTime());
+ k->setTime(elapsed());
k->setType(e->type());
k->setModifiers(e->QInputEvent::modifiers());
k->setText(e->text());
@@ -374,7 +380,7 @@ void QFxTestEnginePrivate::recordKeyEvent(QKeyEvent *e)
testData.actions() << k;
if (testMode == QFxTestEngine::PlaybackTest) {
TestKey *f = qobject_cast<TestKey *>(playbackTestData.next());
- if (!f || f->time() != QUnifiedTimer::instance()->elapsedTime() ||
+ if (!f || f->time() != elapsed() ||
f->type() != e->type() ||
f->modifiers() != e->QInputEvent::modifiers() ||
f->text() != e->text() ||
@@ -400,7 +406,7 @@ void QFxTestEnginePrivate::message(MessageType t, const char *message)
qWarning("%s", message);
if (t == Fail) {
if (exitOnFail) {
- save(QLatin1String("manifest-fail.xml"), false);
+ save(QLatin1String("manifest-fail.qml"), false);
qFatal("Failed");
} else {
status = Failed;
@@ -428,7 +434,7 @@ void QFxTestEngine::save()
if (d->testMode != RecordTest)
return;
- d->save(QLatin1String("manifest.xml"));
+ d->save(QLatin1String("manifest.qml"));
}
void QFxTestEnginePrivate::testPass()
@@ -436,7 +442,7 @@ void QFxTestEnginePrivate::testPass()
if (playbackTestData.atEnd()) {
qWarning("Test PASSED");
if (exitOnFail) {
- save(QLatin1String("manifest-play.xml"));
+ save(QLatin1String("manifest-play.qml"));
exit(0);
} else {
status = Passed;
diff --git a/src/declarative/test/qfxtestobjects.cpp b/src/declarative/test/qfxtestobjects.cpp
index be1ab07..5beefd9 100644
--- a/src/declarative/test/qfxtestobjects.cpp
+++ b/src/declarative/test/qfxtestobjects.cpp
@@ -42,7 +42,8 @@
#include "qfxtestobjects.h"
#include <qml.h>
-#include <QIODevice>
+#include <QDebug>
+#include <QTextStream>
QT_BEGIN_NAMESPACE
@@ -59,6 +60,14 @@ QML_DEFINE_TYPE(TestKey,TestKey);
QML_DECLARE_TYPE(TestLog);
QML_DEFINE_TYPE(TestLog,TestLog);
+static QString padding(int pad)
+{
+ QString p;
+ while (pad--)
+ p += QLatin1Char(' ');
+ return p;
+}
+
TestObject::TestObject(QObject *parent)
: QObject(parent), _time(-1)
{
@@ -77,11 +86,11 @@ void TestObject::setTime(int t)
emit dataChanged();
}
-void TestObject::save(QXmlStreamWriter *device)
+void TestObject::save(QTextStream &device, int pad)
{
- device->writeStartElement(QLatin1String("TestObject"));
- device->writeAttribute(QLatin1String("time"), QString::number(time()));
- device->writeEndElement();
+ device << padding(pad) << QLatin1String("TestObject {") << endl;
+ device << padding(pad) << QLatin1String("time: ") << QString::number(time()) << endl;
+ device << padding(pad) << QLatin1String("}") << endl;
}
@@ -103,12 +112,12 @@ void TestFrame::setHash(const QString &h)
emit frameChanged();
}
-void TestFrame::save(QXmlStreamWriter *device)
+void TestFrame::save(QTextStream &device, int pad)
{
- device->writeStartElement(QLatin1String("TestFrame"));
- device->writeAttribute(QLatin1String("time"), QLatin1String(QByteArray::number(time())));
- device->writeAttribute(QLatin1String("hash"), hash());
- device->writeEndElement();
+ device << padding(pad) << QLatin1String("TestFrame {") << endl;
+ device << padding(pad+4) << QLatin1String("time: ") << QLatin1String(QByteArray::number(time())) << endl;
+ device << padding(pad+4)<< QLatin1String("hash: '") << hash() << QLatin1String("'") << endl;
+ device << padding(pad) << QLatin1Char('}') << endl;
}
TestFullFrame::TestFullFrame(QObject *parent)
@@ -129,12 +138,12 @@ void TestFullFrame::setFrameId(int id)
emit frameChanged();
}
-void TestFullFrame::save(QXmlStreamWriter *device)
+void TestFullFrame::save(QTextStream &device, int pad)
{
- device->writeStartElement(QLatin1String("TestFullFrame"));
- device->writeAttribute(QLatin1String("time"), QLatin1String(QByteArray::number(time())));
- device->writeAttribute(QLatin1String("frameId"), QLatin1String(QByteArray::number(frameId())));
- device->writeEndElement();
+ device << padding(pad) << QLatin1String("TestFullFrame {") << endl;
+ device << padding(pad+4) << QLatin1String("time: ") << QLatin1String(QByteArray::number(time())) << endl;
+ device << padding(pad+4) << QLatin1String("frameId: ") << QLatin1String(QByteArray::number(frameId())) << endl;
+ device << padding(pad) << QLatin1String("}") << endl;
}
TestMouse::TestMouse(QObject *parent)
@@ -207,16 +216,16 @@ void TestMouse::setPos(const QPoint &p)
emit mouseChanged();
}
-void TestMouse::save(QXmlStreamWriter *device)
+void TestMouse::save(QTextStream &device, int pad)
{
- device->writeStartElement(QLatin1String("TestMouse"));
- device->writeAttribute(QLatin1String("time"), QString::number(time()));
- device->writeAttribute(QLatin1String("type"), QString::number(type()));
- device->writeAttribute(QLatin1String("button"), QString::number(button()));
- device->writeAttribute(QLatin1String("buttons"), QString::number(buttons()));
- device->writeAttribute(QLatin1String("globalPos"), QString::number(globalPos().x()) + QLatin1String(",") + QString::number(globalPos().y()));
- device->writeAttribute(QLatin1String("pos"), QString::number(pos().x()) + QLatin1String(",") + QString::number(pos().y()));
- device->writeEndElement();
+ device << padding(pad) << QLatin1String("TestMouse {") << endl;
+ device << padding(pad+4) << QLatin1String("time: ") << QString::number(time()) << endl;
+ device << padding(pad+4) << QLatin1String("type: ") << QString::number(type()) << endl;
+ device << padding(pad+4) << QLatin1String("button: ") << QString::number(button()) << endl;
+ device << padding(pad+4) << QLatin1String("buttons: ") << QString::number(buttons()) << endl;
+ device << padding(pad+4) << QLatin1String("globalPos: '") << QString::number(globalPos().x()) + QLatin1String(",") + QString::number(globalPos().y()) << QLatin1String("'") << endl;
+ device << padding(pad+4) << QLatin1String("pos: '") << QString::number(pos().x()) + QLatin1String(",") + QString::number(pos().y()) << QLatin1String("'") << endl;
+ device << padding(pad) << QLatin1String("}") << endl;
}
TestKey::TestKey(QObject *parent)
@@ -276,16 +285,16 @@ void TestKey::setKey(int k)
emit keyChanged();
}
-void TestKey::save(QXmlStreamWriter *device)
+void TestKey::save(QTextStream &device, int pad)
{
- device->writeStartElement(QLatin1String("TestKey"));
- device->writeAttribute(QLatin1String("time"), QString::number(time()));
- device->writeAttribute(QLatin1String("type"), QString::number(type()));
- device->writeAttribute(QLatin1String("modifiers"), QString::number(modifiers()));
- device->writeAttribute(QLatin1String("key"), QString::number(key()));
+ device << padding(pad) << QLatin1String("TestKey {") << endl;
+ device << padding(pad+4) << QLatin1String("time: ") << QString::number(time()) << endl;
+ device << padding(pad+4) << QLatin1String("type: ") << QString::number(type()) << endl;
+ device << padding(pad+4) << QLatin1String("modifiers: ") << QString::number(modifiers()) << endl;
+ device << padding(pad+4) << QLatin1String("key: ") << QString::number(key()) << endl;
if (key() != Qt::Key_Escape)
- device->writeAttribute(QLatin1String("text"), text());
- device->writeEndElement();
+ device << padding(pad+4) << QLatin1String("text: '") << text() << QLatin1String("'")<< endl;
+ device << padding(pad) << QLatin1String("}") << endl;
}
TestLog::TestLog(QObject *parent)
@@ -313,14 +322,11 @@ void TestLog::save(QIODevice *device)
// Order correctly
qStableSort(_actions.begin(), _actions.end(), lessThan);
- QXmlStreamWriter writer(device);
- writer.setAutoFormatting(true);
- writer.writeStartDocument(QLatin1String("1.0"));
- writer.writeStartElement(QLatin1String("TestLog"));
+ QTextStream writer(device);
+ writer << QLatin1String("TestLog {") << endl;
for (int ii = 0; ii < _actions.count(); ++ii)
- _actions.at(ii)->save(&writer);
- writer.writeEndElement();
- writer.writeEndDocument();
+ _actions.at(ii)->save(writer, 4);
+ writer << QLatin1String("}") << endl;
}
TestObject *TestLog::next()
diff --git a/src/declarative/test/qfxtestobjects.h b/src/declarative/test/qfxtestobjects.h
index 653656e..de4d94b 100644
--- a/src/declarative/test/qfxtestobjects.h
+++ b/src/declarative/test/qfxtestobjects.h
@@ -45,7 +45,7 @@
#include <QtCore/QObject>
#include <QtCore/QPoint>
#include <QtCore/QList>
-#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QTextStream>
QT_BEGIN_HEADER
@@ -64,7 +64,7 @@ public:
int time() const;
void setTime(int);
- virtual void save(QXmlStreamWriter *);
+ virtual void save(QTextStream &, int pad);
Q_SIGNALS:
void dataChanged();
@@ -82,7 +82,7 @@ public:
QString hash() const;
void setHash(const QString &);
- virtual void save(QXmlStreamWriter *);
+ virtual void save(QTextStream &, int pad);
Q_SIGNALS:
void frameChanged();
@@ -100,7 +100,7 @@ public:
int frameId() const;
void setFrameId(int);
- virtual void save(QXmlStreamWriter *);
+ virtual void save(QTextStream &, int pad);
Q_SIGNALS:
void frameChanged();
@@ -134,7 +134,7 @@ public:
QPoint pos() const;
void setPos(const QPoint &);
- virtual void save(QXmlStreamWriter *);
+ virtual void save(QTextStream &, int pad);
Q_SIGNALS:
void mouseChanged();
@@ -169,7 +169,7 @@ public:
int key() const;
void setKey(int);
- virtual void save(QXmlStreamWriter *);
+ virtual void save(QTextStream &, int pad);
Q_SIGNALS:
void keyChanged();
diff --git a/src/declarative/test/qfxtestview.cpp b/src/declarative/test/qfxtestview.cpp
index 94bcb30..0bd5a6b 100644
--- a/src/declarative/test/qfxtestview.cpp
+++ b/src/declarative/test/qfxtestview.cpp
@@ -57,6 +57,7 @@ QFxTestView::QFxTestView(const QString &filename, const QString &testdir)
testEngine = new QFxTestEngine(QFxTestEngine::PlaybackTest, testdir, this, this);
+ qWarning() << "Testing:" << filename;
QFile file(filename);
file.open(QFile::ReadOnly);
QString qml = QString::fromUtf8(file.readAll());
@@ -67,6 +68,8 @@ QFxTestView::QFxTestView(const QString &filename, const QString &testdir)
void QFxTestView::setSceneSize(QSize s)
{
+ if (s.isNull())
+ qWarning() << "Scene size is invalid";
setFixedSize(s);
}
generated by cgit v0.12 at 2025-02-22 00:40:00 (GMT)