diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-19 05:48:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-19 05:48:58 (GMT) |
| commit | 5d577b82f93a10918db319eac9d206dd9fe96e2c (patch) | |
| tree | 2cefeaecc62a2369f3523eee4cca8868da081265 | |
| parent | 19e4d8f19e90841689dbc5dd5d13ad730c1f936d (diff) | |
| parent | 91e69bbc1f390e4da209281d44f734b3d63e8e0f (diff) | |
| download | Qt-5d577b82f93a10918db319eac9d206dd9fe96e2c.zip Qt-5d577b82f93a10918db319eac9d206dd9fe96e2c.tar.gz Qt-5d577b82f93a10918db319eac9d206dd9fe96e2c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/util/qmltimeline_p_p.h | 8 | ||||
| -rw-r--r-- | tools/qmlviewer/main.cpp | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp index 3434635..697be15 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp @@ -295,6 +295,7 @@ void QmlGraphicsAnimatedImage::playingStatusChanged() void QmlGraphicsAnimatedImage::componentComplete() { Q_D(QmlGraphicsAnimatedImage); + QmlGraphicsImage::componentComplete(); if (!d->reply) { setCurrentFrame(d->preset_currentframe); d->preset_currentframe = 0; diff --git a/src/declarative/util/qmltimeline_p_p.h b/src/declarative/util/qmltimeline_p_p.h index f335e7d..f271a3f 100644 --- a/src/declarative/util/qmltimeline_p_p.h +++ b/src/declarative/util/qmltimeline_p_p.h @@ -154,14 +154,6 @@ public: QmlTimeLineEvent(const QmlTimeLineEvent &o); template<class T, void (T::*method)()> - QmlTimeLineEvent(QmlTimeLineObject *b, T *c) - { - d0 = &callFunc<T, method>; - d1 = (void *)c; - d2 = b; - } - - template<class T, void (T::*method)()> static QmlTimeLineEvent timeLineEvent(QmlTimeLineObject *b, T *c) { QmlTimeLineEvent rv; diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp index 97bd8bf..57c445f 100644 --- a/tools/qmlviewer/main.cpp +++ b/tools/qmlviewer/main.cpp @@ -95,6 +95,7 @@ void usage() qWarning(" -record arg .............................. add a recording process argument"); qWarning(" -autorecord [from-]<tomilliseconds> ...... set recording to start and stop"); qWarning(" -devicekeys .............................. use numeric keys (see F1)"); + qWarning(" -dragthreshold <size> .................... set mouse drag threshold size"); qWarning(" -netcache <size> ......................... set disk cache to size bytes"); qWarning(" -translation <translationfile> ........... set the language to run in"); qWarning(" -L <directory> ........................... prepend to the library search path"); @@ -217,6 +218,9 @@ int main(int argc, char ** argv) autorecord_to = range.mid(dash+1).toInt(); } else if (arg == "-devicekeys") { devkeys = true; + } else if (arg == "-dragthreshold") { + if (lastArg) usage(); + app.setStartDragDistance(QString(argv[++i]).toInt()); } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) { fprintf(stderr, "Qt Declarative UI Viewer version %s\n", QT_VERSION_STR); return 0; |