diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-11-19 10:31:47 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-11-19 10:31:47 (GMT) |
| commit | 45ffd89f55a7769c66f6cf15e54994a264012f05 (patch) | |
| tree | c3e3b613bca6bed12e9601eca3891319584af5f9 | |
| parent | 00e99440596d8bf648aefdfbb00e80004e328033 (diff) | |
| parent | 742eb0b52e69aa3406d23293108271fdc245e4d8 (diff) | |
| download | Qt-45ffd89f55a7769c66f6cf15e54994a264012f05.zip Qt-45ffd89f55a7769c66f6cf15e54994a264012f05.tar.gz Qt-45ffd89f55a7769c66f6cf15e54994a264012f05.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
27 files changed, 624 insertions, 627 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 8d56fc8..d941dc4 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -68,7 +68,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/ma -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ -I$(SOURCE_PATH)/tools/shared \ -DQT_NO_PCRE \ - -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \ + -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 4d0121c..c04bcb2 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -40,7 +40,8 @@ CFLAGS_BARE = -c -Fo./ \ -I$(SOURCE_PATH)\tools\shared \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ - -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED + -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED \ + -DQLIBRARYINFO_EPOCROOT CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) CXXFLAGS_BARE = $(CFLAGS_BARE) diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index f313f9e..29fbd0a 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -25,7 +25,7 @@ CFLAGS = -c -o$@ -O \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \ -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_BOOTSTRAPPED + -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT CXXFLAGS = $(CFLAGS) LFLAGS = -static-libgcc -static-libstdc++ -s LIBS = -lole32 -luuid diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index af54288..9c7942c 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -25,7 +25,7 @@ CFLAGS = -c -o$@ -O \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \ -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_BOOTSTRAPPED + -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT CXXFLAGS = $(CFLAGS) LFLAGS = -static-libgcc -static-libstdc++ -s LIBS = -lole32 -luuid diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 36c5d36..7cf94cb 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -3,7 +3,7 @@ CONFIG += depend_includepath QMAKE_INCREMENTAL = SKIP_DEPENDS += qconfig.h qmodules.h DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \ - QT_NO_GEOM_VARIANT QT_NO_DATASTREAM + QT_NO_GEOM_VARIANT QT_NO_DATASTREAM QLIBRARYINFO_EPOCROOT #qmake code SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 4800716..86800ef 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -27,3 +27,5 @@ linux*:!static:!linux-armcc:!linux-gcce { # Compensate for lack of platform defines in Symbian3 and Symbian4 symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) + +include(../../../tools/shared/symbian/epocroot.pri) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 957abbf..acacf7c 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -62,6 +62,10 @@ QT_END_NAMESPACE # include "private/qcore_mac_p.h" #endif +#ifdef QLIBRARYINFO_EPOCROOT +# include "symbian/epocroot.h" +#endif + #include "qconfig.cpp" QT_BEGIN_NAMESPACE @@ -433,6 +437,14 @@ QLibraryInfo::location(LibraryLocation loc) QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2, reg_var.matchedLength() - 3).toLatin1().constData()).constData())); } + +#ifdef QLIBRARYINFO_EPOCROOT + // $${EPOCROOT} is a special case, resolve it similarly to qmake. + QRegExp epocrootMatcher(QLatin1String("\\$\\$\\{EPOCROOT\\}")); + if ((rep = epocrootMatcher.indexIn(ret)) != -1) + ret.replace(rep, epocrootMatcher.matchedLength(), epocRoot()); +#endif + config->endGroup(); } } diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index c7cb794..443c5e9 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -108,7 +108,7 @@ SOURCES += \ dialogs/qwizard.cpp \ dialogs/qprintpreviewdialog.cpp -contains(QT_CONFIG, s60) { +symbian:contains(QT_CONFIG, s60) { LIBS += -lcommondialogs \ -lavkon \ -lplatformenv \ 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 Binary files differindex 56f6ece..8effaef 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png Binary files differindex 56f6ece..8effaef 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png Binary files differindex 56f6ece..8effaef 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png Binary files differindex f8bc3b4..b79af19 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png Binary files differindex e156cd5..ef15fdf 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png 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 Binary files differindex 6408df3..444ee34 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png Binary files differindex 6e7b717..5f3668c 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.10.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png Binary files differindex 7829e03..0ea21f3 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png Binary files differindex 6408df3..444ee34 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png Binary files differindex e2c0a7d..4f285b1 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.9.png 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" } } 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<QString>("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) { diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro index 6beafa3..89694be 100644 --- a/tools/linguist/lrelease/lrelease.pro +++ b/tools/linguist/lrelease/lrelease.pro @@ -15,6 +15,7 @@ macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp include(../../../src/tools/bootstrap/bootstrap.pri) include(../shared/formats.pri) include(../shared/proparser.pri) +include(../../shared/symbian/epocroot.pri) win32:LIBS += -ladvapi32 # for qsettings_win.cpp diff --git a/tools/shared/symbian/epocroot.cpp b/tools/shared/symbian/epocroot.cpp index ae1dcb1..9d7d465 100644 --- a/tools/shared/symbian/epocroot.cpp +++ b/tools/shared/symbian/epocroot.cpp @@ -64,23 +64,13 @@ // Stored as a static value in order to avoid unnecessary re-evaluation. static QString epocRootValue; -#ifdef QT_BUILD_QMAKE -std::ostream &operator<<(std::ostream &s, const QString &val) { - s << val.toLocal8Bit().data(); - return s; -} -#else -// Operator implemented in configureapp.cpp -std::ostream &operator<<(std::ostream &s, const QString &val); -#endif - QString getDevicesXmlPath() { // Note that the following call will return a null string on platforms other // than Windows. If support is required on other platforms for devices.xml, // an alternative mechanism for retrieving the location of this file will // be required. - return readRegistryKey(SYMBIAN_SDKS_REG_HANDLE, SYMBIAN_SDKS_REG_SUBKEY); + return readRegistryKey(SYMBIAN_SDKS_REG_HANDLE, QLatin1String(SYMBIAN_SDKS_REG_SUBKEY)); } /** @@ -92,7 +82,8 @@ void checkEpocRootExists(const QString &source) if (!epocRootValue.isEmpty()) { QDir dir(epocRootValue); if (!dir.exists()) { - std::cerr << "Warning: " << source << " is set to an invalid path: " << epocRootValue << std::endl; + qWarning("Warning: %s is set to an invalid path: '%s'", qPrintable(source), + qPrintable(epocRootValue)); epocRootValue = QString(); } } @@ -103,10 +94,10 @@ void checkEpocRootExists(const QString &source) */ static void fixEpocRoot(QString &path) { - path.replace("\\", "/"); + path.replace(QLatin1Char('\\'), QLatin1Char('/')); - if (!path.size() || path[path.size()-1] != QChar('/')) { - path += QChar('/'); + if (!path.size() || path[path.size()-1] != QLatin1Char('/')) { + path += QLatin1Char('/'); } } @@ -118,17 +109,15 @@ QString epocRoot() if (epocRootValue.isEmpty()) { // 1. If environment variable EPOCROOT is set and points to an existent // directory, this is returned. - epocRootValue = qgetenv("EPOCROOT"); - checkEpocRootExists("EPOCROOT"); + epocRootValue = QString::fromLocal8Bit(qgetenv("EPOCROOT").constData()); + checkEpocRootExists(QLatin1String("EPOCROOT environment variable")); if (epocRootValue.isEmpty()) { // 2. The location of devices.xml is specified by a registry key. If this // file exists, it is parsed. QString devicesXmlPath = getDevicesXmlPath(); - if (devicesXmlPath.isEmpty()) { - std::cerr << "Error: Symbian SDK registry key not found" << std::endl; - } else { - devicesXmlPath += "/devices.xml"; + if (!devicesXmlPath.isEmpty()) { + devicesXmlPath += QLatin1String("/devices.xml"); QFile devicesFile(devicesXmlPath); if (devicesFile.open(QIODevice::ReadOnly)) { @@ -138,87 +127,90 @@ QString epocRoot() // 4. If a device element marked as default is found in devices.xml and its // epocroot value points to an existent directory, this is returned. - const QString epocDeviceValue = qgetenv("EPOCDEVICE"); + const QString epocDeviceValue = QString::fromLocal8Bit(qgetenv("EPOCDEVICE").constData()); bool epocDeviceFound = false; QXmlStreamReader xml(&devicesFile); while (!xml.atEnd()) { xml.readNext(); - if (xml.isStartElement() && xml.name() == "devices") { - if (xml.attributes().value("version") == "1.0") { - while (!(xml.isEndElement() && xml.name() == "devices") && !xml.atEnd()) { + if (xml.isStartElement() && xml.name() == QLatin1String("devices")) { + if (xml.attributes().value(QLatin1String("version")) == QLatin1String("1.0")) { + while (!(xml.isEndElement() && xml.name() == QLatin1String("devices")) && !xml.atEnd()) { xml.readNext(); - if (xml.isStartElement() && xml.name() == "device") { - const bool isDefault = xml.attributes().value("default") == "yes"; - const QString id = xml.attributes().value("id").toString(); - const QString name = xml.attributes().value("name").toString(); - const QString alias = xml.attributes().value("alias").toString(); - bool epocDeviceMatch = (id + ":" + name) == epocDeviceValue; + if (xml.isStartElement() && xml.name() == QLatin1String("device")) { + const bool isDefault = xml.attributes().value(QLatin1String("default")) == QLatin1String("yes"); + const QString id = xml.attributes().value(QLatin1String("id")).toString(); + const QString name = xml.attributes().value(QLatin1String("name")).toString(); + const QString alias = xml.attributes().value(QLatin1String("alias")).toString(); + bool epocDeviceMatch = QString(id + QLatin1String(":") + name) == epocDeviceValue; if (!alias.isEmpty()) epocDeviceMatch |= alias == epocDeviceValue; epocDeviceFound |= epocDeviceMatch; if((epocDeviceValue.isEmpty() && isDefault) || epocDeviceMatch) { // Found a matching device - while (!(xml.isEndElement() && xml.name() == "device") && !xml.atEnd()) { + while (!(xml.isEndElement() && xml.name() == QLatin1String("device")) && !xml.atEnd()) { xml.readNext(); - if (xml.isStartElement() && xml.name() == "epocroot") { + if (xml.isStartElement() && xml.name() == QLatin1String("epocroot")) { epocRootValue = xml.readElementText(); const QString deviceSource = epocDeviceValue.isEmpty() - ? "default device" - : "EPOCDEVICE (" + epocDeviceValue + ")"; + ? QLatin1String("default device") + : QString(QLatin1String("EPOCDEVICE (") + epocDeviceValue + QLatin1String(")")); checkEpocRootExists(deviceSource); } } if (epocRootValue.isEmpty()) - xml.raiseError("No epocroot element found"); + xml.raiseError(QLatin1String("No epocroot element found")); } } } } else { - xml.raiseError("Invalid 'devices' element version"); + xml.raiseError(QLatin1String("Invalid 'devices' element version")); } } } if (xml.hasError()) { - std::cerr << "Error: \"" << xml.errorString() << "\" when parsing devices.xml" << std::endl; + qWarning("Warning: Error \"%s\" when parsing devices.xml", + qPrintable(xml.errorString())); } else { if (epocRootValue.isEmpty()) { if (!epocDeviceValue.isEmpty()) { if (epocDeviceFound) { - std::cerr << "Error: missing or invalid epocroot attribute " - << "in device '" << epocDeviceValue << "'"; + qWarning("Warning: Missing or invalid epocroot attribute in device '%s' in devices.xml.", + qPrintable(epocDeviceValue)); } else { - std::cerr << "Error: no device matching EPOCDEVICE (" - << epocDeviceValue << ")"; + qWarning("Warning: No device matching EPOCDEVICE (%s) in devices.xml.", + qPrintable(epocDeviceValue)); } } else { if (epocDeviceFound) { - std::cerr << "Error: missing or invalid epocroot attribute " - << "in default device"; + qWarning("Warning: Missing or invalid epocroot attribute in default device in devices.xml."); } else { - std::cerr << "Error: no default device"; + qWarning("Warning: No default device set in devices.xml."); } } - std::cerr << " found in devices.xml file." << std::endl; } } } else { - std::cerr << "Error: could not open file " << devicesXmlPath << std::endl; + qWarning("Warning: Could not open file: '%s'.", qPrintable(devicesXmlPath)); } } } if (epocRootValue.isEmpty()) { // 5. An empty string is returned. - std::cerr << "Error: failed to find epoc root" << std::endl - << "Either" << std::endl - << " 1. Set EPOCROOT environment variable to a valid value" << std::endl - << " or 2. Ensure that the HKEY_LOCAL_MACHINE\\" SYMBIAN_SDKS_REG_SUBKEY - " registry key is set, and then" << std::endl - << " a. Set EPOCDEVICE environment variable to a valid device" << std::endl - << " or b. Specify a default device in the devices.xml file." << std::endl; + qWarning("Warning: failed to resolve epocroot." +#ifdef Q_OS_WIN32 + "\nEither\n" + " 1. Set EPOCROOT environment variable to a valid value.\n" + " or 2. Ensure that the HKEY_LOCAL_MACHINE\\" SYMBIAN_SDKS_REG_SUBKEY + " registry key is set, and then\n" + " a. Set EPOCDEVICE environment variable to a valid device\n" + " or b. Specify a default device in the devices.xml file."); +#else + " Set EPOCROOT environment variable to a valid value."); +#endif } else { fixEpocRoot(epocRootValue); } diff --git a/tools/shared/symbian/epocroot.pri b/tools/shared/symbian/epocroot.pri new file mode 100644 index 0000000..117836e --- /dev/null +++ b/tools/shared/symbian/epocroot.pri @@ -0,0 +1,11 @@ +# Epocroot resolving is only required for tools, so omit it from all mobile/embedded builds +!symbian:!wince*:!embedded { +HEADERS += \ + $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.h \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.h +SOURCES += \ + $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp +INCLUDEPATH += $$QT_SOURCE_TREE/tools/shared +DEFINES += QLIBRARYINFO_EPOCROOT +} diff --git a/tools/shared/windows/registry.cpp b/tools/shared/windows/registry.cpp index 67d9b56..2373839 100644 --- a/tools/shared/windows/registry.cpp +++ b/tools/shared/windows/registry.cpp @@ -42,6 +42,7 @@ #include <QtCore/qstringlist.h> #include "registry.h" +#ifdef Q_OS_WIN32 /*! Returns the path part of a registry key. e.g. @@ -73,10 +74,11 @@ static QString keyName(const QString &rKey) return rKey; QString res(rKey.mid(idx + 1)); - if (res == "Default" || res == ".") - res = ""; + if (res == QLatin1String("Default") || res == QLatin1String(".")) + res = QString(); return res; } +#endif QString readRegistryKey(HKEY parentHandle, const QString &rSubkey) { @@ -128,7 +130,7 @@ QString readRegistryKey(HKEY parentHandle, const QString &rSubkey) break; l.append(s); } - result = l.join(", "); + result = l.join(QLatin1String(", ")); break; } |
