diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:56:53 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:56:54 +0200 |
| commit | 9868e6b2f14e146e486e127664789f2978fabed0 (patch) | |
| tree | 335e4a8088c1302ba7602e3e79b3b64eb4ace623 /src | |
| parent | aad8f0bcad607544ede63e8154bcdc14f40fd632 (diff) | |
| parent | 33afb890aefdfbeae6ccee3e91600388b3068108 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iec94e513079426e5d87bdd24753863038cee573e
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/debugger/qpacketprotocol.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeimageprovider.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 3184d3f7..369f0610 100644 --- a/src/declarative/debugger/qpacketprotocol.cpp +++ b/src/declarative/debugger/qpacketprotocol.cpp @@ -300,6 +300,7 @@ void QPacketProtocol::send(const QPacket & p) Q_ASSERT(writeBytes == sizeof(qint32)); writeBytes = d->dev->write(p.b); Q_ASSERT(writeBytes == p.b.size()); + Q_UNUSED(writeBytes); } /*! diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 94498967..0b14ee6f 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -115,8 +115,10 @@ public: { ... - QDeclarativeEngine engine; - engine->addImageProvider(QLatin1String("colors"), new ColorPixmapProvider); + QDeclarativeView *view = new QDeclarativeView; + view->engine()->addImageProvider(QLatin1String("colors"), + new ColorPixmapProvider); + view->setSource(QUrl::fromLocalFile("main.qml")); ... } diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 83bfa170..a72df77a 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -160,10 +160,6 @@ void QDeclarativeAbstractAnimationPrivate::commence() q->transition(actions, properties, QDeclarativeAbstractAnimation::Forward); q->qtAnimation()->start(); - if (q->qtAnimation()->state() != QAbstractAnimation::Running) { - running = false; - emit q->completed(); - } } QDeclarativeProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj) |