From da055325393872e9399577d1962486fb6e3102c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaj=20Gr=C3=B6nholm?= Date: Thu, 18 Feb 2010 14:48:31 +1000 Subject: Add support for startDragDistance in qmlviewer. Adding new parameter "-dragthreshold " which sets mouse drag threshold in pixels. Using this makes qmlviewer more usable in touchscreen devices, where applications may require different thresholds. Merge-request: 6 Reviewed-by: Michael Brasser --- tools/qmlviewer/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp index 14a4735..8cff271 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-] ...... set recording to start and stop"); qWarning(" -devicekeys .............................. use numeric keys (see F1)"); + qWarning(" -dragthreshold .................... set mouse drag threshold size"); qWarning(" -netcache ......................... set disk cache to size bytes"); qWarning(" -translation ........... set the language to run in"); qWarning(" -L ........................... 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; -- cgit v0.12 From 4d035b669d9f790c385b261c7e78b547d4c4eedb Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 19 Feb 2010 13:16:35 +1000 Subject: Remove unused function that breaks build on AIX. --- src/declarative/util/qmltimeline_p_p.h | 8 -------- 1 file changed, 8 deletions(-) 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 - QmlTimeLineEvent(QmlTimeLineObject *b, T *c) - { - d0 = &callFunc; - d1 = (void *)c; - d2 = b; - } - - template static QmlTimeLineEvent timeLineEvent(QmlTimeLineObject *b, T *c) { QmlTimeLineEvent rv; -- cgit v0.12 From 91e69bbc1f390e4da209281d44f734b3d63e8e0f Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 19 Feb 2010 15:28:49 +1000 Subject: Fix "AnimatedImage ignores Anchors setting" Task-number: QTBUG-8343 --- src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp | 1 + 1 file changed, 1 insertion(+) 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; -- cgit v0.12