qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

This commit is contained in:
Alan Alpert 2011-05-16 13:23:22 +10:00
parent 2081a3d0fd c05668a436
commit 12a43977ff
4 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/declarative/qml/qdeclarativeproperty.cpp
View File

@ -183,6 +183,9 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name)
/*!
Creates a QDeclarativeProperty for the property \a name of \a obj
using the \l{QDeclarativeContext} {context} \a ctxt.
Creating a QDeclarativeProperty without a context will render some
properties - like attached properties - inaccessible.
*/
QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
: d(new QDeclarativePropertyPrivate)

1
tests/auto/declarative/declarative.pro
View File

@ -76,6 +76,7 @@ contains(QT_CONFIG, private_tests) {
qdeclarativexmllistmodel \
qpacketprotocol \
qdeclarativev4 \
qsgborderimage \
qsgcanvas \
qsgflickable \
qsgflipable \

50
tests/auto/declarative/qsganimatedimage/tst_qsganimatedimage.cpp
View File

@ -79,19 +79,8 @@ private slots:
void qtbug_16520();
void progressAndStatusChanges();
private:
QPixmap grabScene(QGraphicsScene *scene, int width, int height);
};
QPixmap tst_qsganimatedimage::grabScene(QGraphicsScene *scene, int width, int height)
{
QPixmap screenshot(width, height);
screenshot.fill();
QPainter p_screenshot(&screenshot);
scene->render(&p_screenshot, QRect(0, 0, width, height), QRect(0, 0, width, height));
return screenshot;
}
void tst_qsganimatedimage::play()
{
QDeclarativeEngine engine;
@ -155,20 +144,19 @@ void tst_qsganimatedimage::mirror_running()
{
// test where mirror is set to true after animation has started
QDeclarativeEngine engine;
QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/hearts.qml"));
QSGAnimatedImage *anim = qobject_cast<QSGAnimatedImage *>(component.create());
QSGView *canvas = new QSGView;
canvas->show();
canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/hearts.qml"));
QSGAnimatedImage *anim = qobject_cast<QSGAnimatedImage *>(canvas->rootObject());
QVERIFY(anim);
QGraphicsScene scene;
int width = anim->property("width").toInt();
int height = anim->property("height").toInt();
scene.addItem(qobject_cast<QSGItem *>(anim));
QCOMPARE(anim->currentFrame(), 0);
QPixmap frame0 = grabScene(&scene, width, height);
QPixmap frame0 = canvas->renderPixmap();
anim->setCurrentFrame(1);
QPixmap frame1 = grabScene(&scene, width, height);
QPixmap frame1 = canvas->renderPixmap();
anim->setCurrentFrame(0);
@ -179,11 +167,11 @@ void tst_qsganimatedimage::mirror_running()
anim->setProperty("mirror", true);
QCOMPARE(anim->currentFrame(), 1);
QPixmap frame1_flipped = grabScene(&scene, width, height);
QPixmap frame1_flipped = canvas->renderPixmap();
QTRY_VERIFY(spy.count() == 1); spy.clear();
QCOMPARE(anim->currentFrame(), 0); // animation only has 2 frames, should cycle back to first
QPixmap frame0_flipped = grabScene(&scene, width, height);
QPixmap frame0_flipped = canvas->renderPixmap();
QTransform transform;
transform.translate(width, 0).scale(-1, 1.0);
@ -192,22 +180,23 @@ void tst_qsganimatedimage::mirror_running()
QCOMPARE(frame0_flipped, frame0_expected);
QCOMPARE(frame1_flipped, frame1_expected);
delete canvas;
}
void tst_qsganimatedimage::mirror_notRunning()
{
QFETCH(QUrl, fileUrl);
QDeclarativeEngine engine;
QDeclarativeComponent component(&engine, fileUrl);
QSGAnimatedImage *anim = qobject_cast<QSGAnimatedImage *>(component.create());
QSGView *canvas = new QSGView;
canvas->show();
canvas->setSource(fileUrl);
QSGAnimatedImage *anim = qobject_cast<QSGAnimatedImage *>(canvas->rootObject());
QVERIFY(anim);
QGraphicsScene scene;
int width = anim->property("width").toInt();
int height = anim->property("height").toInt();
scene.addItem(qobject_cast<QSGItem *>(anim));
QPixmap screenshot = grabScene(&scene, width, height);
QPixmap screenshot = canvas->renderPixmap();
QTransform transform;
transform.translate(width, 0).scale(-1, 1.0);
@ -218,8 +207,9 @@ void tst_qsganimatedimage::mirror_notRunning()
bool paused = anim->isPlaying();
anim->setProperty("mirror", true);
screenshot = grabScene(&scene, width, height);
screenshot = canvas->renderPixmap();
QEXPECT_FAIL("", "QTBUG-19252", Abort);
QCOMPARE(screenshot, expected);
// mirroring should not change the current frame or playing status
@ -227,7 +217,7 @@ void tst_qsganimatedimage::mirror_notRunning()
QCOMPARE(anim->isPlaying(), playing);
QCOMPARE(anim->isPaused(), paused);
delete anim;
delete canvas;
}
void tst_qsganimatedimage::mirror_notRunning_data()

10
tests/auto/declarative/qsgborderimage/tst_qsgborderimage.cpp
View File

@ -224,7 +224,7 @@ void tst_qsgborderimage::smooth()
void tst_qsgborderimage::mirror()
{
QSGView *canvas = new QSGView(0);
QSGView *canvas = new QSGView;
canvas->show();
canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/mirror.qml"));
@ -234,14 +234,12 @@ void tst_qsgborderimage::mirror()
int width = image->property("width").toInt();
QPixmap screenshot = canvas->renderPixmap();
QTransform transform;
transform.translate(width, 0).scale(-1, 1.0);
QPixmap expected = screenshot.transformed(transform);
image->setProperty("mirror", true);
screenshot = canvas->renderPixmap();
QPixmap mirrored;
QCOMPARE(screenshot, expected);
QEXPECT_FAIL("", "QTBUG-19252", Abort);
QCOMPARE(screenshot, mirrored);
delete canvas;
}