From 62d1149357736a0dd9b8a439edb73c30f6d407ad Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 17 Nov 2010 13:22:50 +0100 Subject: tst_qnetworkreply: Fix ugly test Properly use the event loop. Signals have to be connected directly after using the get() method of QNetworkAccessManager. Else they might have already been emitted while the event loop was spinning. Reviewed-by: Peter Hartmann --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 41b3e0a..ddb7687 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -4130,8 +4130,23 @@ void tst_QNetworkReply::httpProxyCommands() QCOMPARE(receivedHeader, expectedCommand); } +class ProxyChangeHelper : public QObject { + Q_OBJECT +public: + ProxyChangeHelper() : QObject(), signalCount(0) {}; +public slots: + void finishedSlot() { + signalCount++; + if (signalCount == 2) + QMetaObject::invokeMethod(&QTestEventLoop::instance(), "exitLoop", Qt::QueuedConnection); + } +private: + int signalCount; +}; + void tst_QNetworkReply::proxyChange() { + ProxyChangeHelper helper; MiniHttpServer proxyServer( "HTTP/1.0 200 OK\r\nProxy-Connection: keep-alive\r\n" "Content-Length: 1\r\n\r\n1"); @@ -4141,30 +4156,15 @@ void tst_QNetworkReply::proxyChange() manager.setProxy(dummyProxy); QNetworkReplyPtr reply1 = manager.get(req); - QSignalSpy finishedspy(reply1, SIGNAL(finished())); + connect(reply1, SIGNAL(finished()), &helper, SLOT(finishedSlot())); manager.setProxy(QNetworkProxy()); QNetworkReplyPtr reply2 = manager.get(req); + connect(reply2, SIGNAL(finished()), &helper, SLOT(finishedSlot())); - connect(reply2, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); -#ifdef Q_OS_SYMBIAN - // we need more time as: - // 1. running from the emulator - // 2. not perfect POSIX implementation - // 3. embedded device QTestEventLoop::instance().enterLoop(20); -#else - QTestEventLoop::instance().enterLoop(10); -#endif QVERIFY(!QTestEventLoop::instance().timeout()); - if (finishedspy.count() == 0) { - // wait for the second reply as well - connect(reply1, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); - QTestEventLoop::instance().enterLoop(1); - QVERIFY(!QTestEventLoop::instance().timeout()); - } - // verify that the replies succeeded QCOMPARE(reply1->error(), QNetworkReply::NoError); QCOMPARE(reply1->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200); -- cgit v0.12 From 346953b985deb5003e801b23063daf3f6dee3824 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 17 Nov 2010 19:08:02 +0100 Subject: Use GLIBC functions on any GLIBC architecture. Make use of __GLIBC__ instead of Q_OS_LINUX for functions available globally in GNU libc, not just on Linux. the !__UCLIBC__ are still needed, as uClibc defines __GLIBC__ for compatibility with a lot of applications which rely on it. Task-number: QTBUG-15401 --- src/corelib/tools/qlocale.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 6b1de5e..d152682 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -77,7 +77,7 @@ QT_END_NAMESPACE #include #include -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__) # include #endif @@ -6637,7 +6637,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *si _control87(MCW_EM, MCW_EM); #endif -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__) fenv_t envp; feholdexcept(&envp); #endif @@ -6653,7 +6653,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *si #endif //_M_X64 #endif //Q_OS_WIN -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__) fesetenv(&envp); #endif -- cgit v0.12 From c4e4ac16a4c2c23b6d883312d7370241a8a66a1c Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 18 Nov 2010 10:55:41 +1000 Subject: Standardize selection color in visual test Task-number: QTBUG-14792 --- .../qdeclarativetextedit/MultilineEdit.qml | 1 + .../data-X11/usingMultilineEdit.10.png | Bin 2020 -> 2032 bytes .../data-X11/usingMultilineEdit.11.png | Bin 2020 -> 2032 bytes .../data-X11/usingMultilineEdit.12.png | Bin 2020 -> 2032 bytes .../data-X11/usingMultilineEdit.7.png | Bin 1836 -> 1843 bytes .../data-X11/usingMultilineEdit.9.png | Bin 2008 -> 2024 bytes .../data-X11/usingMultilineEdit.qml | 540 ++++++++++----------- .../qmlvisual/qdeclarativetextinput/LineEdit.qml | 1 + .../data-X11/usingLineEdit.1.png | Bin 1325 -> 1337 bytes .../data-X11/usingLineEdit.10.png | Bin 1378 -> 1389 bytes .../data-X11/usingLineEdit.11.png | Bin 1455 -> 1468 bytes .../data-X11/usingLineEdit.2.png | Bin 1325 -> 1337 bytes .../data-X11/usingLineEdit.9.png | Bin 1456 -> 1471 bytes .../data-X11/usingLineEdit.qml | 516 ++++++++++---------- 14 files changed, 530 insertions(+), 528 deletions(-) diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml index 4273f32..17709ba 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml @@ -46,6 +46,7 @@ Item { horizontalAlignment: TextInput.AlignLeft wrapMode: TextEdit.WordWrap font.pixelSize:15 + selectionColor: 'steelblue' } MouseArea { //Implements all line edit mouse handling diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png index 56f6ece..8effaef 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png index 56f6ece..8effaef 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png index 56f6ece..8effaef 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png index f8bc3b4..b79af19 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png index e156cd5..ef15fdf 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml index 56ae969..a03948c 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.qml @@ -2098,7 +2098,7 @@ VisualTest { } Frame { msec: 5856 - hash: "6e3ef70a6a20c61d681c0510da3dba63" + hash: "4b0c9ae119bd6c9f6331cbefc53afa3d" } Mouse { type: 5 @@ -2118,7 +2118,7 @@ VisualTest { } Frame { msec: 5872 - hash: "6e3ef70a6a20c61d681c0510da3dba63" + hash: "4b0c9ae119bd6c9f6331cbefc53afa3d" } Mouse { type: 5 @@ -2138,7 +2138,7 @@ VisualTest { } Frame { msec: 5888 - hash: "12199badcd73e1dead9e7fb8848175a7" + hash: "e6b3b80f052fec9f67b02a7f36676b5d" } Mouse { type: 5 @@ -2158,7 +2158,7 @@ VisualTest { } Frame { msec: 5904 - hash: "9a10e37dad5bce8a6a3e9dfe3789ea71" + hash: "37d1ee8e1c914d499dd7920576dadcae" } Mouse { type: 5 @@ -2178,7 +2178,7 @@ VisualTest { } Frame { msec: 5920 - hash: "9a10e37dad5bce8a6a3e9dfe3789ea71" + hash: "37d1ee8e1c914d499dd7920576dadcae" } Mouse { type: 5 @@ -2198,7 +2198,7 @@ VisualTest { } Frame { msec: 5936 - hash: "a636fd97f33ef06215d71ce3c4b5e151" + hash: "34f7bd61afb22009181d79841bc59fa1" } Mouse { type: 5 @@ -2218,7 +2218,7 @@ VisualTest { } Frame { msec: 5952 - hash: "b0967a28cd241da39213d6c8478280f7" + hash: "23ea9471d132daab6193b0809c8bd98e" } Mouse { type: 5 @@ -2238,7 +2238,7 @@ VisualTest { } Frame { msec: 5968 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2250,7 +2250,7 @@ VisualTest { } Frame { msec: 5984 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2270,7 +2270,7 @@ VisualTest { } Frame { msec: 6000 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2290,7 +2290,7 @@ VisualTest { } Frame { msec: 6016 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2310,7 +2310,7 @@ VisualTest { } Frame { msec: 6032 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2330,7 +2330,7 @@ VisualTest { } Frame { msec: 6048 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2350,7 +2350,7 @@ VisualTest { } Frame { msec: 6064 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2370,7 +2370,7 @@ VisualTest { } Frame { msec: 6080 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2390,7 +2390,7 @@ VisualTest { } Frame { msec: 6096 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2410,7 +2410,7 @@ VisualTest { } Frame { msec: 6112 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2430,7 +2430,7 @@ VisualTest { } Frame { msec: 6128 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2450,7 +2450,7 @@ VisualTest { } Frame { msec: 6144 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2470,7 +2470,7 @@ VisualTest { } Frame { msec: 6160 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2490,7 +2490,7 @@ VisualTest { } Frame { msec: 6176 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2502,23 +2502,23 @@ VisualTest { } Frame { msec: 6192 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Frame { msec: 6208 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Frame { msec: 6224 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Frame { msec: 6240 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Frame { msec: 6256 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2530,7 +2530,7 @@ VisualTest { } Frame { msec: 6272 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2550,7 +2550,7 @@ VisualTest { } Frame { msec: 6288 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2570,7 +2570,7 @@ VisualTest { } Frame { msec: 6304 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2590,7 +2590,7 @@ VisualTest { } Frame { msec: 6320 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2610,7 +2610,7 @@ VisualTest { } Frame { msec: 6336 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2630,7 +2630,7 @@ VisualTest { } Frame { msec: 6352 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2650,7 +2650,7 @@ VisualTest { } Frame { msec: 6368 - hash: "684d7a67d57fdc766dca3092c65cf089" + hash: "e35d1c5a15474388727942b41fdcec0f" } Mouse { type: 5 @@ -2670,7 +2670,7 @@ VisualTest { } Frame { msec: 6384 - hash: "81c12a084635c80c97f6b3cd3574a6e6" + hash: "1b24d0c17446cfadc351127f842ac5fd" } Mouse { type: 5 @@ -2682,7 +2682,7 @@ VisualTest { } Frame { msec: 6400 - hash: "81c12a084635c80c97f6b3cd3574a6e6" + hash: "1b24d0c17446cfadc351127f842ac5fd" } Mouse { type: 5 @@ -2702,7 +2702,7 @@ VisualTest { } Frame { msec: 6416 - hash: "8374126491796963e3f5895dab7e9076" + hash: "f0b06fefc9e18b836ffe081215efe584" } Mouse { type: 5 @@ -2722,7 +2722,7 @@ VisualTest { } Frame { msec: 6432 - hash: "d7f5f6f0654d055ff47bef6736bbcfc6" + hash: "9ed30cb00df82cce04e8c8b76d056013" } Mouse { type: 5 @@ -2742,7 +2742,7 @@ VisualTest { } Frame { msec: 6448 - hash: "85c94958294c8590e1cb9c74bf741bb2" + hash: "4d37a34962e019f47201da6baddebca8" } Mouse { type: 5 @@ -2754,7 +2754,7 @@ VisualTest { } Frame { msec: 6464 - hash: "586c98412d41f892eb07d8c41cb3c990" + hash: "cd83055403901b1a7a99dfda3798ca7e" } Mouse { type: 5 @@ -2794,7 +2794,7 @@ VisualTest { } Frame { msec: 6496 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2814,7 +2814,7 @@ VisualTest { } Frame { msec: 6512 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2834,7 +2834,7 @@ VisualTest { } Frame { msec: 6528 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2854,7 +2854,7 @@ VisualTest { } Frame { msec: 6544 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2874,7 +2874,7 @@ VisualTest { } Frame { msec: 6560 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2894,7 +2894,7 @@ VisualTest { } Frame { msec: 6576 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2914,27 +2914,27 @@ VisualTest { } Frame { msec: 6592 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Frame { msec: 6608 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Frame { msec: 6624 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Frame { msec: 6640 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Frame { msec: 6656 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Frame { msec: 6672 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2954,7 +2954,7 @@ VisualTest { } Frame { msec: 6688 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2974,7 +2974,7 @@ VisualTest { } Frame { msec: 6704 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -2994,7 +2994,7 @@ VisualTest { } Frame { msec: 6720 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3034,7 +3034,7 @@ VisualTest { } Frame { msec: 6752 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3054,7 +3054,7 @@ VisualTest { } Frame { msec: 6768 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3074,7 +3074,7 @@ VisualTest { } Frame { msec: 6784 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3094,7 +3094,7 @@ VisualTest { } Frame { msec: 6800 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3114,7 +3114,7 @@ VisualTest { } Frame { msec: 6816 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3134,7 +3134,7 @@ VisualTest { } Frame { msec: 6832 - hash: "120ac252477fd32ecb696e6796b0984b" + hash: "71cdc5a9144234556630430361779ff7" } Mouse { type: 5 @@ -3662,19 +3662,19 @@ VisualTest { } Frame { msec: 8208 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Frame { msec: 8224 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Frame { msec: 8240 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Frame { msec: 8256 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Key { type: 7 @@ -3686,19 +3686,19 @@ VisualTest { } Frame { msec: 8272 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Frame { msec: 8288 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Frame { msec: 8304 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Frame { msec: 8320 - hash: "acfeaebe60368dd946a2fa80ab15df1d" + hash: "c8254066bc7b4bae0934425226d59a2b" } Key { type: 6 @@ -3710,19 +3710,19 @@ VisualTest { } Frame { msec: 8336 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8352 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8368 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8384 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Key { type: 7 @@ -3734,23 +3734,23 @@ VisualTest { } Frame { msec: 8400 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8416 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8432 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8448 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Frame { msec: 8464 - hash: "c21a0997b7d428306b5caa09dd02e9d3" + hash: "7bd48f4441ba1971bf49cb5b9e174935" } Key { type: 6 @@ -3762,19 +3762,19 @@ VisualTest { } Frame { msec: 8480 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8496 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8512 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8528 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Key { type: 7 @@ -3786,31 +3786,31 @@ VisualTest { } Frame { msec: 8544 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8560 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8576 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8592 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8608 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8624 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8640 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8656 @@ -3826,139 +3826,139 @@ VisualTest { } Frame { msec: 8672 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8688 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8704 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8720 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8736 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8752 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8768 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8784 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8800 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8816 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8832 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8848 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8864 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8880 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8896 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8912 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8928 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8944 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8960 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8976 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 8992 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9008 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9024 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9040 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9056 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9072 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9088 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9104 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9120 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9136 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9152 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9168 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9184 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9200 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Mouse { type: 2 @@ -3970,11 +3970,11 @@ VisualTest { } Frame { msec: 9216 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9232 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Mouse { type: 5 @@ -3986,7 +3986,7 @@ VisualTest { } Frame { msec: 9248 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Mouse { type: 5 @@ -4006,7 +4006,7 @@ VisualTest { } Frame { msec: 9264 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Mouse { type: 5 @@ -4026,7 +4026,7 @@ VisualTest { } Frame { msec: 9280 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Mouse { type: 3 @@ -4038,43 +4038,43 @@ VisualTest { } Frame { msec: 9296 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9312 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9328 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9344 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9360 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9376 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9392 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9408 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9424 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Frame { msec: 9440 - hash: "af707ae0e8110b2e6e3d1041aaa89319" + hash: "edf44121a60ee9d975954863c2ed848c" } Mouse { type: 2 @@ -4086,27 +4086,27 @@ VisualTest { } Frame { msec: 9456 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9472 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9488 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9504 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9520 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9536 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Mouse { type: 3 @@ -4118,19 +4118,19 @@ VisualTest { } Frame { msec: 9552 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9568 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9584 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9600 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9616 @@ -4138,15 +4138,15 @@ VisualTest { } Frame { msec: 9632 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9648 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9664 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Key { type: 6 @@ -4158,111 +4158,111 @@ VisualTest { } Frame { msec: 9680 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9696 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9712 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9728 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9744 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9760 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9776 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9792 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9808 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9824 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9840 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9856 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9872 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9888 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9904 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9920 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9936 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9952 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9968 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 9984 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10000 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10016 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10032 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10048 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10064 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10080 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10096 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Key { type: 6 @@ -4274,35 +4274,35 @@ VisualTest { } Frame { msec: 10112 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10128 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10144 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10160 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10176 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10192 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10208 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10224 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Key { type: 7 @@ -4314,35 +4314,35 @@ VisualTest { } Frame { msec: 10240 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10256 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10272 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10288 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10304 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10320 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10336 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Frame { msec: 10352 - hash: "d99a651d8ed51c36dbca0ca86abc808e" + hash: "956f4f8cfca76cfee9babea29b0715ea" } Key { type: 6 @@ -4354,27 +4354,27 @@ VisualTest { } Frame { msec: 10368 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10384 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10400 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10416 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10432 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10448 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Key { type: 7 @@ -4386,31 +4386,31 @@ VisualTest { } Frame { msec: 10464 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10480 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10496 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10512 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10528 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10544 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10560 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10576 @@ -4418,19 +4418,19 @@ VisualTest { } Frame { msec: 10592 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10608 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10624 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10640 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Key { type: 7 @@ -4442,223 +4442,223 @@ VisualTest { } Frame { msec: 10656 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10672 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10688 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10704 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10720 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10736 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10752 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10768 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10784 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10800 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10816 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10832 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10848 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10864 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10880 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10896 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10912 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10928 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10944 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10960 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10976 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 10992 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11008 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11024 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11040 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11056 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11072 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11088 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11104 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11120 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11136 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11152 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11168 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11184 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11200 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11216 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11232 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11248 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11264 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11280 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11296 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11312 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11328 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11344 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11360 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11376 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11392 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11408 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11424 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11440 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11456 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11472 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11488 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11504 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11520 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11536 @@ -4666,22 +4666,22 @@ VisualTest { } Frame { msec: 11552 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11568 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11584 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11600 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } Frame { msec: 11616 - hash: "e940f5582d8ad5487221743f15041021" + hash: "b58ab2c31823e7b0be144fba3e77368a" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml index 50c3cb4..6789eac 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml @@ -42,6 +42,7 @@ Item { text:"" horizontalAlignment: TextInput.AlignLeft font.pixelSize:15 + selectionColor: 'steelblue' } MouseArea { //Implements all line edit mouse handling diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png index 6408df3..444ee34 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png index 6e7b717..5f3668c 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png index 7829e03..0ea21f3 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png index 6408df3..444ee34 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png index e2c0a7d..4f285b1 100644 Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png differ diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml index 386c9d1..8957e39 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.qml @@ -274,23 +274,23 @@ VisualTest { } Frame { msec: 992 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1008 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1024 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1040 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1056 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Mouse { type: 3 @@ -302,79 +302,79 @@ VisualTest { } Frame { msec: 1072 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1088 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1104 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1120 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1136 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1152 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1168 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1184 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1200 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1216 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1232 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1248 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1264 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1280 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1296 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1312 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1328 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1344 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1360 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Key { type: 6 @@ -386,143 +386,143 @@ VisualTest { } Frame { msec: 1376 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1392 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1408 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1424 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1440 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1456 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1472 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1488 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1504 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1520 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1536 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1552 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1568 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1584 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1600 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1616 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1632 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1648 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1664 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1680 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1696 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1712 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1728 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1744 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1760 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1776 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1792 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1808 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1824 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1840 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1856 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1872 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1888 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1904 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1920 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1936 @@ -530,15 +530,15 @@ VisualTest { } Frame { msec: 1952 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1968 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 1984 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Key { type: 6 @@ -550,35 +550,35 @@ VisualTest { } Frame { msec: 2000 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2016 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2032 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2048 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2064 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2080 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2096 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2112 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Key { type: 7 @@ -598,95 +598,95 @@ VisualTest { } Frame { msec: 2128 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2144 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2160 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2176 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2192 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2208 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2224 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2240 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2256 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2272 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2288 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2304 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2320 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2336 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2352 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2368 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2384 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2400 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2416 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2432 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2448 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2464 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Frame { msec: 2480 - hash: "29ccc1cc5ae395d91c92ed4645d3b376" + hash: "b888cf6d6e002e28690cff49726eea70" } Key { type: 6 @@ -2630,7 +2630,7 @@ VisualTest { } Frame { msec: 8592 - hash: "e1349a4271e99bb99b46271fd4a3190e" + hash: "8173ad74ad73a8061af3edb8322b3e28" } Mouse { type: 5 @@ -2650,7 +2650,7 @@ VisualTest { } Frame { msec: 8608 - hash: "e1349a4271e99bb99b46271fd4a3190e" + hash: "8173ad74ad73a8061af3edb8322b3e28" } Mouse { type: 5 @@ -2662,7 +2662,7 @@ VisualTest { } Frame { msec: 8624 - hash: "69fafd9730dc1bb6fdb5485a2b16c025" + hash: "a470057b75a1aade3945dbb61526ae50" } Mouse { type: 5 @@ -2682,7 +2682,7 @@ VisualTest { } Frame { msec: 8640 - hash: "69fafd9730dc1bb6fdb5485a2b16c025" + hash: "a470057b75a1aade3945dbb61526ae50" } Mouse { type: 5 @@ -2714,7 +2714,7 @@ VisualTest { } Frame { msec: 8672 - hash: "2271dcb95090d595070fd1fcde1b8792" + hash: "74c1edc228a7c4ba1c0adab9ed7dd086" } Mouse { type: 5 @@ -2726,7 +2726,7 @@ VisualTest { } Frame { msec: 8688 - hash: "2271dcb95090d595070fd1fcde1b8792" + hash: "74c1edc228a7c4ba1c0adab9ed7dd086" } Mouse { type: 5 @@ -2746,7 +2746,7 @@ VisualTest { } Frame { msec: 8704 - hash: "2271dcb95090d595070fd1fcde1b8792" + hash: "74c1edc228a7c4ba1c0adab9ed7dd086" } Mouse { type: 5 @@ -2766,7 +2766,7 @@ VisualTest { } Frame { msec: 8720 - hash: "2271dcb95090d595070fd1fcde1b8792" + hash: "74c1edc228a7c4ba1c0adab9ed7dd086" } Mouse { type: 5 @@ -2786,7 +2786,7 @@ VisualTest { } Frame { msec: 8736 - hash: "0bc5d6855feb4174bdf64b95ff9f7df2" + hash: "11e31d23d38f163c2c28ca042af7f9f6" } Mouse { type: 5 @@ -2806,7 +2806,7 @@ VisualTest { } Frame { msec: 8752 - hash: "0bc5d6855feb4174bdf64b95ff9f7df2" + hash: "11e31d23d38f163c2c28ca042af7f9f6" } Mouse { type: 5 @@ -2826,7 +2826,7 @@ VisualTest { } Frame { msec: 8768 - hash: "0bc5d6855feb4174bdf64b95ff9f7df2" + hash: "11e31d23d38f163c2c28ca042af7f9f6" } Mouse { type: 5 @@ -2846,7 +2846,7 @@ VisualTest { } Frame { msec: 8784 - hash: "0bc5d6855feb4174bdf64b95ff9f7df2" + hash: "11e31d23d38f163c2c28ca042af7f9f6" } Mouse { type: 5 @@ -2866,7 +2866,7 @@ VisualTest { } Frame { msec: 8800 - hash: "fcd2c706258d7f84245d7f4c4f578711" + hash: "045f891731548aae37090e0cefb62170" } Mouse { type: 5 @@ -2886,7 +2886,7 @@ VisualTest { } Frame { msec: 8816 - hash: "fcd2c706258d7f84245d7f4c4f578711" + hash: "045f891731548aae37090e0cefb62170" } Mouse { type: 5 @@ -2906,7 +2906,7 @@ VisualTest { } Frame { msec: 8832 - hash: "95fbe459d9d4b9304f7743ed2955761a" + hash: "3b6f55bc49e7e326e40b0f3faae71a8b" } Mouse { type: 5 @@ -2926,7 +2926,7 @@ VisualTest { } Frame { msec: 8848 - hash: "38618228457b1b8a5b5572f95cefa3c0" + hash: "abc04cd8ca8759f981f8e2c3b30a33ac" } Mouse { type: 5 @@ -2946,7 +2946,7 @@ VisualTest { } Frame { msec: 8864 - hash: "fabf4dcd599440c0aed8f53f3775bfea" + hash: "f96cc6aa0a38639146d8d691d699946b" } Mouse { type: 5 @@ -2966,7 +2966,7 @@ VisualTest { } Frame { msec: 8880 - hash: "4f93faf3f05bf4a0f93806a57249f264" + hash: "483743419cee348e8f6e24fd1e900ae6" } Mouse { type: 5 @@ -2986,7 +2986,7 @@ VisualTest { } Frame { msec: 8896 - hash: "3ebbfb29f0dd1f8466bf7f05f6e28c84" + hash: "50292f48ceeaee5f55795aea736631d0" } Mouse { type: 5 @@ -3006,7 +3006,7 @@ VisualTest { } Frame { msec: 8912 - hash: "119df59fa65d757270027302fcb54a4a" + hash: "9739b19d1496baabad1a01cf35c90374" } Mouse { type: 5 @@ -3026,7 +3026,7 @@ VisualTest { } Frame { msec: 8928 - hash: "4fe3e6954d29a485220979dc5a41d22f" + hash: "bcf1719dc1ec19d3cca83e41ffd4ba0d" } Mouse { type: 5 @@ -3046,7 +3046,7 @@ VisualTest { } Frame { msec: 8944 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3066,11 +3066,11 @@ VisualTest { } Frame { msec: 8960 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 8976 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3090,7 +3090,7 @@ VisualTest { } Frame { msec: 8992 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3102,55 +3102,55 @@ VisualTest { } Frame { msec: 9008 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9024 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9040 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9056 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9072 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9088 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9104 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9120 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9136 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9152 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9168 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9184 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Frame { msec: 9200 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3162,7 +3162,7 @@ VisualTest { } Frame { msec: 9216 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3174,7 +3174,7 @@ VisualTest { } Frame { msec: 9232 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3194,7 +3194,7 @@ VisualTest { } Frame { msec: 9248 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3214,7 +3214,7 @@ VisualTest { } Frame { msec: 9264 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3234,7 +3234,7 @@ VisualTest { } Frame { msec: 9280 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3254,7 +3254,7 @@ VisualTest { } Frame { msec: 9296 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3274,7 +3274,7 @@ VisualTest { } Frame { msec: 9312 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3294,7 +3294,7 @@ VisualTest { } Frame { msec: 9328 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3314,7 +3314,7 @@ VisualTest { } Frame { msec: 9344 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3334,7 +3334,7 @@ VisualTest { } Frame { msec: 9360 - hash: "a55b441971f1964165ecb5204138de6a" + hash: "192a6cf285d42c7a2996bf0342e69c97" } Mouse { type: 5 @@ -3354,7 +3354,7 @@ VisualTest { } Frame { msec: 9376 - hash: "fb89eb81e839415d143584bfa5a173bb" + hash: "b79a6b6b2a670212a0f4310323352862" } Mouse { type: 5 @@ -3374,7 +3374,7 @@ VisualTest { } Frame { msec: 9392 - hash: "fb89eb81e839415d143584bfa5a173bb" + hash: "b79a6b6b2a670212a0f4310323352862" } Mouse { type: 5 @@ -3394,7 +3394,7 @@ VisualTest { } Frame { msec: 9408 - hash: "fb89eb81e839415d143584bfa5a173bb" + hash: "b79a6b6b2a670212a0f4310323352862" } Mouse { type: 5 @@ -3414,7 +3414,7 @@ VisualTest { } Frame { msec: 9424 - hash: "d1f1478814752c8c8174b13cb8004840" + hash: "82ad8cef2dc81cf061785c211f1b2233" } Mouse { type: 5 @@ -3434,7 +3434,7 @@ VisualTest { } Frame { msec: 9440 - hash: "ab1fc96781b13ab2d1529733314b06b0" + hash: "dc5c2e4ac2c51ac7b84a527a77313ff5" } Mouse { type: 5 @@ -3454,7 +3454,7 @@ VisualTest { } Frame { msec: 9456 - hash: "ab1fc96781b13ab2d1529733314b06b0" + hash: "dc5c2e4ac2c51ac7b84a527a77313ff5" } Mouse { type: 5 @@ -3474,7 +3474,7 @@ VisualTest { } Frame { msec: 9472 - hash: "6611c3444e8e1c580f9520729f72e3f1" + hash: "dceeee37f46351f54a6dbf9e1d304017" } Mouse { type: 5 @@ -3494,7 +3494,7 @@ VisualTest { } Frame { msec: 9488 - hash: "6611c3444e8e1c580f9520729f72e3f1" + hash: "dceeee37f46351f54a6dbf9e1d304017" } Mouse { type: 5 @@ -3514,7 +3514,7 @@ VisualTest { } Frame { msec: 9504 - hash: "ffcd54ddae6c10f13719a219991676f8" + hash: "b5b370f86804d875363c8aa9fa53c0fe" } Mouse { type: 5 @@ -3534,7 +3534,7 @@ VisualTest { } Frame { msec: 9520 - hash: "ffcd54ddae6c10f13719a219991676f8" + hash: "b5b370f86804d875363c8aa9fa53c0fe" } Mouse { type: 5 @@ -3546,7 +3546,7 @@ VisualTest { } Frame { msec: 9536 - hash: "ffcd54ddae6c10f13719a219991676f8" + hash: "b5b370f86804d875363c8aa9fa53c0fe" } Mouse { type: 5 @@ -3566,7 +3566,7 @@ VisualTest { } Frame { msec: 9552 - hash: "c238beb854cf7fc10b6e66da121cce67" + hash: "8ae0e57709d94c27ecf34f9e76623ba8" } Mouse { type: 5 @@ -3586,7 +3586,7 @@ VisualTest { } Frame { msec: 9568 - hash: "c238beb854cf7fc10b6e66da121cce67" + hash: "8ae0e57709d94c27ecf34f9e76623ba8" } Mouse { type: 5 @@ -3606,7 +3606,7 @@ VisualTest { } Frame { msec: 9584 - hash: "f14cf91c575fc535a78f9b5ed8cb0e77" + hash: "a29b5440525c9fbed90096f287396c91" } Mouse { type: 5 @@ -3626,7 +3626,7 @@ VisualTest { } Frame { msec: 9600 - hash: "92f069682e3da947d3dc933710651f89" + hash: "d1091d48e0875fec9372c382c6961562" } Mouse { type: 5 @@ -3658,7 +3658,7 @@ VisualTest { } Frame { msec: 9632 - hash: "92f069682e3da947d3dc933710651f89" + hash: "d1091d48e0875fec9372c382c6961562" } Mouse { type: 5 @@ -3678,7 +3678,7 @@ VisualTest { } Frame { msec: 9648 - hash: "92f069682e3da947d3dc933710651f89" + hash: "d1091d48e0875fec9372c382c6961562" } Mouse { type: 5 @@ -3698,7 +3698,7 @@ VisualTest { } Frame { msec: 9664 - hash: "4ca308a9d8f3bb87716572c68fad7040" + hash: "e1ac646b512dec95946fb52811c269da" } Mouse { type: 5 @@ -3718,7 +3718,7 @@ VisualTest { } Frame { msec: 9680 - hash: "4881497fb4545083332f9df690c318ca" + hash: "29dfbe2f8ecee4ff5ecdf358a94f35f8" } Mouse { type: 5 @@ -3738,7 +3738,7 @@ VisualTest { } Frame { msec: 9696 - hash: "a71d94653ec839a0f1f135f3c83653d4" + hash: "2ce02f81e21d4f9a3fd8d78fc8182898" } Mouse { type: 5 @@ -3758,7 +3758,7 @@ VisualTest { } Frame { msec: 9712 - hash: "547567cd4c4c265a6f9684c8af537825" + hash: "09e41ca9d2286e99cdecb446a33cbf99" } Mouse { type: 5 @@ -3778,7 +3778,7 @@ VisualTest { } Frame { msec: 9728 - hash: "b6776260aa3bf44338ba6ac694b855d3" + hash: "6d780f15bc7597420fc10b1a2f1c7f7f" } Mouse { type: 5 @@ -3798,7 +3798,7 @@ VisualTest { } Frame { msec: 9744 - hash: "190e18262e86e3341e0131cfe0d15edc" + hash: "afb956a94411eba22a0257faa5cbc57f" } Mouse { type: 5 @@ -3818,7 +3818,7 @@ VisualTest { } Frame { msec: 9760 - hash: "3b6059bba0a5092d3667bf2b1c1b6c71" + hash: "8739d2d2f9d96f0bce61ce95bf1e6062" } Mouse { type: 5 @@ -3838,7 +3838,7 @@ VisualTest { } Frame { msec: 9776 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3858,7 +3858,7 @@ VisualTest { } Frame { msec: 9792 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3870,7 +3870,7 @@ VisualTest { } Frame { msec: 9808 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3882,7 +3882,7 @@ VisualTest { } Frame { msec: 9824 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3894,7 +3894,7 @@ VisualTest { } Frame { msec: 9840 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3906,11 +3906,11 @@ VisualTest { } Frame { msec: 9856 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 9872 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3922,7 +3922,7 @@ VisualTest { } Frame { msec: 9888 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3934,7 +3934,7 @@ VisualTest { } Frame { msec: 9904 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3946,7 +3946,7 @@ VisualTest { } Frame { msec: 9920 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3958,11 +3958,11 @@ VisualTest { } Frame { msec: 9936 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 9952 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3974,7 +3974,7 @@ VisualTest { } Frame { msec: 9968 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3986,7 +3986,7 @@ VisualTest { } Frame { msec: 9984 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -3998,11 +3998,11 @@ VisualTest { } Frame { msec: 10000 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10016 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 5 @@ -4014,59 +4014,59 @@ VisualTest { } Frame { msec: 10032 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10048 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10064 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10080 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10096 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10112 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10128 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10144 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10160 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10176 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10192 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10208 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10224 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10240 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Mouse { type: 3 @@ -4078,83 +4078,83 @@ VisualTest { } Frame { msec: 10256 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10272 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10288 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10304 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10320 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10336 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10352 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10368 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10384 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10400 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10416 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10432 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10448 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10464 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10480 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10496 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10512 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10528 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10544 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10560 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10576 @@ -4162,174 +4162,174 @@ VisualTest { } Frame { msec: 10592 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10608 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10624 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10640 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10656 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10672 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10688 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10704 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10720 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10736 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10752 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10768 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10784 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10800 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10816 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10832 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10848 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10864 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10880 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10896 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10912 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10928 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10944 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10960 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10976 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 10992 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11008 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11024 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11040 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11056 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11072 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11088 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11104 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11120 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11136 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11152 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11168 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11184 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11200 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11216 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11232 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11248 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } Frame { msec: 11264 - hash: "7e3db3b35aa908d1ff0d0e43d6dbdb54" + hash: "4e2cb8e4cedab8df2ff823e18b17e575" } } -- cgit v0.12 From bd5e41af834c764f756d0f49d1eb29bf9518f1ed Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 18 Nov 2010 15:38:32 +1000 Subject: Fine-tune the tests being run on the CI system. We don't want to bother running tests on QWS, or text tests on X11 until they update the ubuntu version. Task-number: QTBUG-14792 --- tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 46 +++++----------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp index ce08eab..8d4d0d1 100644 --- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp +++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp @@ -102,43 +102,17 @@ void tst_qmlvisual::visual_data() QTest::addColumn("testdata"); QStringList files; - if (qgetenv("QMLVISUAL_ALL") != "0") - files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR)); - else { - //these are newly added tests we want to try out in CI (then move to the stable list) - files << QT_TEST_SOURCE_DIR "/animation/qtbug10586/qtbug10586.qml"; - files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated.qml"; - files << QT_TEST_SOURCE_DIR "/qdeclarativeflipable/test-flipable.qml"; - files << QT_TEST_SOURCE_DIR "/qdeclarativepositioners/usingRepeater.qml"; - files << QT_TEST_SOURCE_DIR "/animation/parentAnimation2/parentAnimation2.qml"; - - //these are tests we think are stable and useful enough to be run by the CI system - files << QT_TEST_SOURCE_DIR "/animation/bindinganimation/bindinganimation.qml"; - files << QT_TEST_SOURCE_DIR "/animation/loop/loop.qml"; - files << QT_TEST_SOURCE_DIR "/animation/parallelAnimation/parallelAnimation-visual.qml"; - files << QT_TEST_SOURCE_DIR "/animation/parentAnimation/parentAnimation-visual.qml"; - files << QT_TEST_SOURCE_DIR "/animation/reanchor/reanchor.qml"; - files << QT_TEST_SOURCE_DIR "/animation/scriptAction/scriptAction-visual.qml"; - files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/drag.qml"; - files << QT_TEST_SOURCE_DIR "/fillmode/fillmode.qml"; - - // new tests - files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/mousearea-flickable.qml"; - - //these reliably fail in CI, for unknown reasons - //files << QT_TEST_SOURCE_DIR "/animation/easing/easing.qml"; - //files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml"; - //files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/borders.qml"; - //files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated-smooth.qml"; - - //these reliably fail on Linux because of color interpolation (different float rounding) -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) - files << QT_TEST_SOURCE_DIR "/animation/colorAnimation/colorAnimation-visual.qml"; - files << QT_TEST_SOURCE_DIR "/animation/propertyAction/propertyAction-visual.qml"; + files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR)); + if (qgetenv("QMLVISUAL_ALL") != "1") { + //Text on X11 varies per distro - and the CI system is currently using something outdated. +#if defined(Q_WS_X11) + foreach(const QString &str, files.filter(QRegExp(".*text.*"))) + files.removeAll(str); +#endif + //We don't want QWS test results to mire down the CI system +#if defined(Q_WS_QWS) + files.clear(); #endif - - //this is unstable because the MouseArea press-and-hold timer is not synchronized to the animation framework. - //files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/mousearea-visual.qml"; } foreach (const QString &file, files) { -- cgit v0.12 From 2c40c98a5b3ff4f16c4ad71b5707d5271945819e Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Thu, 18 Nov 2010 12:15:03 +0200 Subject: QToolbar should fill available width on Symbian Normally QStyle provides a minimum size for a widget. However, to imitate native toolbar behavior, QToolBar should occupy available screen estate on Symbian (with QS60Style). This is only supported for horizontal QToolBars as native side does not have same functionality for vertical toolbars. QToolbar size now tries to take into account available size of parent reduced by margins (if several parents, then each can reduce the available space by their margins). Also, toolbar internal pixel metrics data (item spacing, item margins) are taken into account. Task-number: QTBUG-13120 Reviewed-by: Janne Koskinen --- src/gui/styles/qs60style.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 5fe9050..5eddc98 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2536,6 +2536,56 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, if (const QStyleOptionToolButton *toolBtn = qstyleoption_cast(opt)) if (toolBtn->subControls & SC_ToolButtonMenu) sz += QSize(pixelMetric(PM_MenuButtonIndicator), 0); + + //Make toolbuttons in toolbar stretch the whole screen area + if (widget && qobject_cast(widget->parentWidget())) { + const QToolBar *tb = qobject_cast(widget->parentWidget()); + const bool parentCanGrowHorizontally = !(tb->sizePolicy().horizontalPolicy() == QSizePolicy::Fixed || + tb->sizePolicy().horizontalPolicy() == QSizePolicy::Maximum) && tb->orientation() == Qt::Horizontal; + + if (parentCanGrowHorizontally) { + int visibleButtons = 0; + //Make the auto-stretch to happen only for horizontal orientation + if (tb && tb->orientation() == Qt::Horizontal) { + QList actionList = tb->actions(); + for (int i = 0; i < actionList.count(); i++) { + if (actionList.at(i)->isVisible()) + visibleButtons++; + } + } + + if (widget->parentWidget() && visibleButtons > 0) { + QWidget *w = const_cast(widget); + int toolBarMaxWidth = 0; + int totalMargin = 0; + while (w) { + //honor fixed width parents + if (w->maximumWidth() == w->minimumWidth()) + toolBarMaxWidth = qMax(toolBarMaxWidth, w->maximumWidth()); + if (w->layout() && w->windowType() == Qt::Widget) { + totalMargin += w->layout()->contentsMargins().left() + + w->layout()->contentsMargins().right(); + } + w = w->parentWidget(); + } + totalMargin += 2 * pixelMetric(QStyle::PM_ToolBarFrameWidth); + + if (toolBarMaxWidth == 0) + toolBarMaxWidth = + QApplication::desktop()->availableGeometry(widget->parentWidget()).width(); + //Reduce the margins, toolbar frame, item spacing and internal margin from available area + toolBarMaxWidth -= totalMargin; + + //ensure that buttons are side-by-side and not on top of each other + const int toolButtonWidth = (toolBarMaxWidth / visibleButtons) + - pixelMetric(QStyle::PM_ToolBarItemSpacing) + - pixelMetric(QStyle::PM_ToolBarItemMargin) + //toolbar frame needs to be reduced again, since QToolBarLayout adds it for each toolbar action + - 2 * pixelMetric(QStyle::PM_ToolBarFrameWidth) - 1; + sz.setWidth(qMax(toolButtonWidth, sz.width())); + } + } + } break; case CT_PushButton: sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget); -- cgit v0.12 From faf0e9966c319ac774db3d4967d902772c30e526 Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Thu, 18 Nov 2010 13:06:10 +0200 Subject: Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs Due to somewhat questionable .pro-file flagging, the plugin is not currently compiled at all for latest Sym^3 environments. Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the upcoming platform versions change, this should work in the future. Task-number: QTBUG-15428 Reviewed-by: Mikka Heikkinen --- src/plugins/s60/feedback/feedback.pro | 2 +- src/plugins/s60/s60.pro | 2 +- src/s60installs/s60installs.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro index 1069220..5e577ec 100644 --- a/src/plugins/s60/feedback/feedback.pro +++ b/src/plugins/s60/feedback/feedback.pro @@ -6,7 +6,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { +!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { HEADERS += qtactileFeedback.h SOURCES += qtactileFeedback_s60.cpp diff --git a/src/plugins/s60/s60.pro b/src/plugins/s60/s60.pro index ffcd170..1ddf326 100644 --- a/src/plugins/s60/s60.pro +++ b/src/plugins/s60/s60.pro @@ -6,7 +6,7 @@ symbian { SUBDIRS += 3_1 3_2 } - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { SUBDIRS += feedback } diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 65b8781..7827fb6 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -87,7 +87,7 @@ symbian: { DEPLOYMENT += bearer_plugin } - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback DEPLOYMENT += feedback_plugin -- cgit v0.12 From 31feffb92570c6e13618cc2d0d03a5f243a7e350 Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Thu, 18 Nov 2010 13:06:10 +0200 Subject: Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs Due to somewhat questionable .pro-file flagging, the plugin is not currently compiled at all for latest Sym^3 environments. Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the upcoming platform versions change, this should work in the future. Task-number: QTBUG-15428 Reviewed-by: Miikka Heikkinen --- src/plugins/s60/feedback/feedback.pro | 2 +- src/plugins/s60/s60.pro | 2 +- src/s60installs/s60installs.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro index 1069220..5e577ec 100644 --- a/src/plugins/s60/feedback/feedback.pro +++ b/src/plugins/s60/feedback/feedback.pro @@ -6,7 +6,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE -contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { +!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { HEADERS += qtactileFeedback.h SOURCES += qtactileFeedback_s60.cpp diff --git a/src/plugins/s60/s60.pro b/src/plugins/s60/s60.pro index ffcd170..1ddf326 100644 --- a/src/plugins/s60/s60.pro +++ b/src/plugins/s60/s60.pro @@ -6,7 +6,7 @@ symbian { SUBDIRS += 3_1 3_2 } - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { SUBDIRS += feedback } diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 65b8781..7827fb6 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -87,7 +87,7 @@ symbian: { DEPLOYMENT += bearer_plugin } - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback DEPLOYMENT += feedback_plugin -- cgit v0.12 From a26d41fc2732e225dc9a1b5eb5224cc499ae87b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Thu, 18 Nov 2010 15:06:45 +0100 Subject: Improve performance of hfw in qgridlayoutengine by adding more caching. The previous code tried to do caching of queries with constraints too, but it's usecase was rather limited. The caching worked for the simple case of effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); // uses cache The problem was that if somebody called this sequence: effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); effectiveSizeHint(Qt::PreferredSize, QSize(-1, -1)); effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); Each call would disregard the cache because the constraint was different. Now the pattern is used in the qgridlayoutengine itself when we calculate hfw: (yes, height-for-width). First, we ask for the horizontal size hints with no constraints. Then, we'll ask for the vertical size hints with constraints. Since horizontal and vertical ultimately comes from the same function (effectiveSizeHint) it will invalidate the cache each time. The solution is to add another cache for the sizeHints with constraints. The most notable improvement is in the hfw, nested case. Result: RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested": 546 msecs per iteration (total: 546, iterations: 1) RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested": 0.000029 msecs per iteration (total: 62, iterations: 2097152) Improvement: 18,827,586 times faster (!!) --- src/gui/graphicsview/qgraphicslayoutitem.cpp | 35 ++++-- src/gui/graphicsview/qgraphicslayoutitem_p.h | 2 + .../qgraphicslinearlayout.pro | 6 + .../tst_qgraphicslinearlayout.cpp | 133 +++++++++++++++++++++ 4 files changed, 165 insertions(+), 11 deletions(-) create mode 100644 tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro create mode 100644 tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index e43f7fa..016cfbf 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -137,19 +137,28 @@ void QGraphicsLayoutItemPrivate::init() QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) const { Q_Q(const QGraphicsLayoutItem); - if (!sizeHintCacheDirty && cachedConstraint == constraint) - return cachedSizeHints; + QSizeF *sizeHintCache; + const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0; + if (hasConstraint) { + if (!sizeHintWithConstraintCacheDirty && constraint == cachedConstraint) + return cachedSizeHintsWithConstraints; + sizeHintCache = cachedSizeHintsWithConstraints; + } else { + if (!sizeHintCacheDirty) + return cachedSizeHints; + sizeHintCache = cachedSizeHints; + } for (int i = 0; i < Qt::NSizeHints; ++i) { - cachedSizeHints[i] = constraint; + sizeHintCache[i] = constraint; if (userSizeHints) - combineSize(cachedSizeHints[i], userSizeHints[i]); + combineSize(sizeHintCache[i], userSizeHints[i]); } - QSizeF &minS = cachedSizeHints[Qt::MinimumSize]; - QSizeF &prefS = cachedSizeHints[Qt::PreferredSize]; - QSizeF &maxS = cachedSizeHints[Qt::MaximumSize]; - QSizeF &descentS = cachedSizeHints[Qt::MinimumDescent]; + QSizeF &minS = sizeHintCache[Qt::MinimumSize]; + QSizeF &prefS = sizeHintCache[Qt::PreferredSize]; + QSizeF &maxS = sizeHintCache[Qt::MaximumSize]; + QSizeF &descentS = sizeHintCache[Qt::MinimumDescent]; normalizeHints(minS.rwidth(), prefS.rwidth(), maxS.rwidth(), descentS.rwidth()); normalizeHints(minS.rheight(), prefS.rheight(), maxS.rheight(), descentS.rheight()); @@ -175,9 +184,13 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) // Not supported yet // COMBINE_SIZE(descentS, q->sizeHint(Qt::MinimumDescent, constraint)); - cachedConstraint = constraint; - sizeHintCacheDirty = false; - return cachedSizeHints; + if (hasConstraint) { + cachedConstraint = constraint; + sizeHintWithConstraintCacheDirty = false; + } else { + sizeHintCacheDirty = false; + } + return sizeHintCache; } diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h index b752e03..d72ee9f 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem_p.h +++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h @@ -85,8 +85,10 @@ public: QSizeF *userSizeHints; mutable QSizeF cachedSizeHints[Qt::NSizeHints]; mutable QSizeF cachedConstraint; + mutable QSizeF cachedSizeHintsWithConstraints[Qt::NSizeHints]; mutable quint32 sizeHintCacheDirty : 1; + mutable quint32 sizeHintWithConstraintCacheDirty : 1; quint32 isLayout : 1; quint32 ownedByLayout : 1; diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro new file mode 100644 index 0000000..ff85fe8 --- /dev/null +++ b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_bench_qgraphicslinearlayout + +SOURCES += tst_qgraphicslinearlayout.cpp + diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp new file mode 100644 index 0000000..0dd9543 --- /dev/null +++ b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include + +class tst_QGraphicsLinearLayout : public QObject +{ + Q_OBJECT +public: + tst_QGraphicsLinearLayout() {} + ~tst_QGraphicsLinearLayout() {} + +private slots: + void heightForWidth_data(); + void heightForWidth(); +}; + + +struct MySquareWidget : public QGraphicsWidget +{ + MySquareWidget() {} + virtual QSizeF sizeHint ( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const + { + if (which != Qt::PreferredSize) + return QGraphicsWidget::sizeHint(which, constraint); + if (constraint.width() < 0) + return QGraphicsWidget::sizeHint(which, constraint); + return QSizeF(constraint.width(), constraint.width()); + } +}; + +void tst_QGraphicsLinearLayout::heightForWidth_data() +{ + QTest::addColumn("hfw"); + QTest::addColumn("nested"); + + QTest::newRow("hfw") << true << false; + QTest::newRow("hfw, nested") << true << true; + QTest::newRow("not hfw") << false << false; + QTest::newRow("not hfw, nested") << false << true; +} + +void tst_QGraphicsLinearLayout::heightForWidth() +{ + QFETCH(bool, hfw); + QFETCH(bool, nested); + + QGraphicsScene scene; + QGraphicsWidget *form = new QGraphicsWidget; + scene.addItem(form); + + QGraphicsLinearLayout *outerlayout = 0; + if (nested) { + outerlayout = new QGraphicsLinearLayout(form); + for(int i = 0; i < 8; i++) { + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); + outerlayout->addItem(layout); + outerlayout = layout; + } + } + + QGraphicsLinearLayout *qlayout = 0; + qlayout = new QGraphicsLinearLayout(Qt::Vertical); + if (nested) + outerlayout->addItem(qlayout); + else + form->setLayout(qlayout); + + MySquareWidget *widget = new MySquareWidget; + for (int i = 0; i < 1; i++) { + widget = new MySquareWidget; + QSizePolicy sizepolicy = widget->sizePolicy(); + sizepolicy.setHeightForWidth(hfw); + widget->setSizePolicy(sizepolicy); + qlayout->addItem(widget); + } + // make sure only one iteration is done. + // run with tst_QGraphicsLinearLayout.exe "heightForWidth" -tickcounter -iterations 6 + // this will iterate 6 times the whole test, (not only the benchmark) + // which should reduce warmup time and give a realistic picture of the performance of + // effectiveSizeHint() + QSizeF constraint(hfw ? 100 : -1, -1); + QBENCHMARK { + (void)form->effectiveSizeHint(Qt::PreferredSize, constraint); + } + +} + + +QTEST_MAIN(tst_QGraphicsLinearLayout) + +#include "tst_qgraphicslinearlayout.moc" -- cgit v0.12 From 4258dd04e25c8831be9e8a7dc45b52d34782cb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Fri, 19 Nov 2010 11:19:32 +0100 Subject: Fix the tests that got affected by the behaviour added in 604c51f1fc5c79 Task-number: QTBUG-13551 Task-number: QTBUG-7756 --- tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 2e52c4e..35ea059 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -2541,7 +2541,7 @@ void tst_QGraphicsGridLayout::geometries_data() .sizeHint(Qt::MaximumSize, QSizeF(5000,5000)) .heightForWidth(hfw1) ) - << QSizeF(160, 401) + << QSizeF(160, 350) << (RectList() << QRectF( 0, 0, 80, 100) << QRectF( 80, 0, 80, 100) << QRectF( 0, 100, 80, 100) << QRectF( 80, 100, 80, 250) @@ -2566,7 +2566,7 @@ void tst_QGraphicsGridLayout::geometries_data() .sizeHint(Qt::MaximumSize, QSizeF(5000,5000)) .heightForWidth(hfw1) ) - << QSizeF(500, 401) + << QSizeF(500, 200) << (RectList() << QRectF( 0, 0, 100, 100) << QRectF(100, 0, 100, 100) << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400, 50) -- cgit v0.12