diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-11-08 04:50:51 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-11-08 04:50:51 (GMT) |
commit | 40119b446ebf96cf1f03d60ed3eada18f33f1b52 (patch) | |
tree | e31b5e047724094074d31a617bd1459855f63b82 | |
parent | 16316f170fde30b91ed884a95d5910bd4de63782 (diff) | |
parent | 0f1599edcc8624682efb9514bb9b4ac0519c7017 (diff) | |
download | Qt-40119b446ebf96cf1f03d60ed3eada18f33f1b52.zip Qt-40119b446ebf96cf1f03d60ed3eada18f33f1b52.tar.gz Qt-40119b446ebf96cf1f03d60ed3eada18f33f1b52.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
161 files changed, 6273 insertions, 3977 deletions
diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp index 709d945..aaaaaac 100644 --- a/demos/declarative/minehunt/minehunt.cpp +++ b/demos/declarative/minehunt/minehunt.cpp @@ -211,7 +211,7 @@ bool MinehuntGame::flip(int row, int col) bool MinehuntGame::flag(int row, int col) { TileData *t = tile(row, col); - if(!t || !playing) + if(!t || !playing || t->flipped()) return false; t->setHasFlag(!t->hasFlag()); diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 753ca4e..8a7fdc5 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = minehunt QT += declarative -CONFIG += qt plugin # Input HEADERS += minehunt.h @@ -21,4 +20,4 @@ symbian:{ qmlminehuntfiles.sources = MinehuntCore minehunt.qml DEPLOYMENT = qmlminehuntfiles } -
\ No newline at end of file + diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index b66c5a6..ab49c04 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -92,9 +92,7 @@ Rectangle { enabled: nameInputDialog.initialWidth != 0 } - onOpened: nameInputText.focus = true; onClosed: { - nameInputText.focus = false; if (nameInputText.text != "") Logic.saveHighScore(nameInputText.text); } @@ -116,7 +114,7 @@ Rectangle { TextInput { id: nameInputText anchors { verticalCenter: parent.verticalCenter; left: dialogText.right } - focus: false + focus: visible autoScroll: false maximumLength: 24 onTextChanged: { diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 27f72bb..b94d2b8 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -19,7 +19,6 @@ <example filename="sub-attaq" name="Sub-attaq" /> <example filename="spectrum" name="Spectrum Analyzer" /> <example filename="declarative/minehunt" name="Minehunt"/> - <example filename="declarative/snake" name="Snake" executable="false" qml="true"/> <example filename="deform" name="Vector Deformation" /> <example filename="books" name="Books" /> <example filename="mainwindow" name="Main Window" /> diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc index b30a700..df82fba 100644 --- a/doc/src/development/designer-manual.qdoc +++ b/doc/src/development/designer-manual.qdoc @@ -1769,37 +1769,54 @@ pixmap property in the property editor. \title Using a Designer UI File in Your Application - With Qt's integrated build tools, \l{qmake Manual}{qmake} and \l uic, the - code for user interface components created with \QD is automatically - generated when the rest of your application is built. Forms can be included - and used directly from your application. Alternatively, you can use them to - extend subclasses of standard widgets. These forms can be processed at - compile time or at run time, depending on the approach used. + Qt Designer UI files represent the widget tree of the form in XML format. The + forms can be processed: + \list + \o \l{Compile Time Form Processing}{At compile time}, which means that forms + are converted to C++ code that can be compiled. + \o \l{Run Time Form Processing}{At runtime}, which means that forms are processed + by the QUiLoader class that dynamically constructs the widget tree while + parsing the XML file. + \endlist \tableofcontents \section1 Compile Time Form Processing + You create user interface components with \QD and use Qt's integrated build tools, + \l{qmake Manual}{qmake} and \l{User Interface Compiler (uic)}{uic}, to generate code + for them when the application is built. The generated code contains the form's user + interface object. It is a C++ struct that contains: + + \list + \o Pointers to the form's widgets, layouts, layout items, + button groups, and actions. + \o A member function called \c setupUi() to build the widget tree + on the parent widget. + \o A member function called \c retranslateUi() that handles the + translation of the string properties of the form. For more information, + see \l{Reacting to Language Changes}. + \endlist + + The generated code can be included in your application and used directly from + it. Alternatively, you can use it to extend subclasses of standard widgets. + A compile time processed form can be used in your application with one of the following approaches: \list - \o The Direct Approach: you construct a widget to use as a placeholder + \o \l{The Direct Approach}: you construct a widget to use as a placeholder for the component, and set up the user interface inside it. - \o The Single Inheritance Approach: you subclass the form's base class + \o \l{The Single Inheritance Approach}: you subclass the form's base class (QWidget or QDialog, for example), and include a private instance of the form's user interface object. - \o The MultipleInheritance Approach: you subclass both the form's base + \o \l{The Multiple Inheritance Approach}: you subclass both the form's base class and the form's user interface object. This allows the widgets defined in the form to be used directly from within the scope of the subclass. \endlist - - \section2 The Direct Approach - - To demonstrate how to use user interface (UI) files straight from - \QD, we create a simple Calculator Form application. This is based on the + To demonstrate, we create a simple Calculator Form application. It is based on the original \l{Calculator Form Example}{Calculator Form} example. The application consists of one source file, \c main.cpp and a UI @@ -1817,15 +1834,18 @@ pixmap property in the property editor. The special feature of this file is the \c FORMS declaration that tells \c qmake which files to process with \c uic. In this case, the \c calculatorform.ui file is used to create a \c ui_calculatorform.h file - that can be used by any file listed in the \c SOURCES declaration. To - ensure that \c qmake generates the \c ui_calculatorform.h file, we need to - include it in a file listed in \c SOURCES. Since we only have \c main.cpp, - we include it there: + that can be used by any file listed in the \c SOURCES declaration. - \snippet doc/src/snippets/uitools/calculatorform/main.cpp 0 + \note You can use Qt Creator to create the Calculator Form project. It + automatically generates the main.cpp, UI, and .pro files, which you can + then modify. + + \section2 The Direct Approach - This include is an additional check to ensure that we do not generate code - for UI files that are not used. + To use the direct approach, we include the \c ui_calculatorform.h file + directly in \c main.cpp: + + \snippet doc/src/snippets/uitools/calculatorform/main.cpp 0 The \c main function creates the calculator widget by constructing a standard QWidget that we use to host the user interface described by the @@ -1837,23 +1857,33 @@ pixmap property in the property editor. from the \c ui_calculatorform.h file that sets up all the dialog's widgets and the connections between its signals and slots. - This approach provides a quick and easy way to use simple, self-contained - components in your applications, but many componens created with \QD will + The direct approach provides a quick and easy way to use simple, self-contained + components in your applications. However, componens created with \QD often require close integration with the rest of the application code. For instance, the \c CalculatorForm code provided above will compile and run, but the QSpinBox objects will not interact with the QLabel as we need a custom slot to carry out the add operation and display the result in the - QLabel. To achieve this, we need to subclass a standard Qt widget (known as - the single inheritance approach). - + QLabel. To achieve this, we need to use the single inheritance approach. \section2 The Single Inheritance Approach + To use the single inheritance approach, we subclass a standard Qt widget and + include a private instance of the form's user interface object. This can take + the form of: + + \list + \o A member variable + \o A pointer member variable + \endlist + + \section3 Using a Member Variable + In this approach, we subclass a Qt widget and set up the user interface from within the constructor. Components used in this way expose the widgets and layouts used in the form to the Qt widget subclass, and provide a standard system for making signal and slot connections between the user interface and other objects in your application. + The generated \c{Ui::CalculatorForm} structure is a member of the class. This approach is used in the \l{Calculator Form Example}{Calculator Form} example. @@ -1893,6 +1923,52 @@ pixmap property in the property editor. them. This approach can be used to create individual tabs from existing forms, for example. + \section3 Using a Pointer Member Variable + + Alternatively, the \c{Ui::CalculatorForm} structure can be made a pointer + member of the class. The header then looks as follows: + + \code + + namespace Ui { + class CalculatorForm; + } + + class CalculatorForm : public QWidget + ... + virtual ~CalculatorForm(); + ... + private: + Ui::CalculatorForm *ui; + ... + + \endcode + + The corresponding source file looks as follows: + + \code + #include "ui_calculatorform.h" + + CalculatorForm::CalculatorForm(QWidget *parent) : + QWidget(parent), ui(new Ui::CalculatorForm) + { + ui->setupUi(this); + } + + CalculatorForm::~CalculatorForm() + { + delete ui; + } + \endcode + + The advantage of this approach is that the user interface object can be + forward-declared, which means that we do not have to include the generated + \c ui_calculatorform.h file in the header. The form can then be changed without + recompiling the dependent source files. This is particularly important if the + class is subject to binary compatibility restrictions. + + We generally recommend this approach for libraries and large applications. + For more information, see \l{Creating Shared Libraries}. \section2 The Multiple Inheritance Approach @@ -1906,13 +1982,14 @@ pixmap property in the property editor. {Multiple Inheritance} example. We need to include the header file that \c uic generates from the - \c calculatorform.ui file: + \c calculatorform.ui file, as follows: \snippet examples/uitools/multipleinheritance/calculatorform.h 0 The class is defined in a similar way to the one used in the \l{The Single Inheritance Approach}{single inheritance approach}, except that - this time we inherit from \e{both} QWidget and \c{Ui::CalculatorForm}: + this time we inherit from \e{both} QWidget and \c{Ui::CalculatorForm}, + as follows: \snippet examples/uitools/multipleinheritance/calculatorform.h 1 @@ -1931,11 +2008,26 @@ pixmap property in the property editor. same say as a widget created in code by hand. We no longer require the \c{ui} prefix to access them. - Subclassing using multiple inheritance gives us more direct access to the - contents of the form, is slightly cleaner than the single inheritance - approach, but does not conveniently support composition of multiple user - interfaces. + \section2 Reacting to Language Changes + + Qt notifies applications if the user interface language changes by sending an + event of the type QEvent::LanguageChange. To call the member function + \c retranslateUi() of the user interface object, we reimplement + \c QWidget::changeEvent() in the form class, as follows: + \code + void CalculatorForm::changeEvent(QEvent *e) + { + QWidget::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } + } + \endcode \section1 Run Time Form Processing diff --git a/doc/src/platforms/emb-pointer.qdoc b/doc/src/platforms/emb-pointer.qdoc index 22935b4..81e532f 100644 --- a/doc/src/platforms/emb-pointer.qdoc +++ b/doc/src/platforms/emb-pointer.qdoc @@ -186,8 +186,11 @@ device file. Some drivers also require write access to the device file. For instance, if you have specified the mouse driver with \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 11 - then examine the permissions of the device file by entering the following - command in a console: + then examine the permissions of the device file by entering the + following command in a console: + \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc show permissions + Change the permissions of the device file, if necessary, in the following + way: \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 12 If the device file is actually a symbolic link to another file, you must diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc index d333c90..b051a98 100644 --- a/doc/src/snippets/code/doc_src_emb-pointer.qdoc +++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc @@ -104,6 +104,10 @@ QWS_MOUSE_PROTO=IntelliMouse:/dev/input/mouse0 //! [11] +//! [show permissions] +ls -l /dev/input/mouse0 +//! [show permissions] + //! [12] chmod a+rw /dev/input/mouse0 //! [12] diff --git a/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml b/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml new file mode 100644 index 0000000..1888f4e --- /dev/null +++ b/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** 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 documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: page + color: "white" + width: 180; height: 180 + +//! [tiled border image] +BorderImage { + width: 180; height: 180 + border { left: 30; top: 30; right: 30; bottom: 30 } + source: "pics/borderframe.png" +} +//! [tiled border image] +} diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp index 2c976ff..75ffb01 100644 --- a/examples/network/bearermonitor/bearermonitor.cpp +++ b/examples/network/bearermonitor/bearermonitor.cpp @@ -41,8 +41,8 @@ #include "bearermonitor.h" #include "sessionwidget.h" -#include <QDebug> -#include <QMessageBox> +#include <QtCore/QDebug> + #ifdef Q_OS_WIN #include <winsock2.h> #undef interface @@ -56,20 +56,18 @@ BearerMonitor::BearerMonitor(QWidget *parent) : QWidget(parent) { setupUi(this); -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#ifdef MAEMO_UI newSessionButton->hide(); deleteSessionButton->hide(); #else delete tabWidget->currentWidget(); sessionGroup->hide(); #endif -#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(MAEMO_UI) setWindowState(Qt::WindowMaximized); #endif updateConfigurations(); -#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty()); -#endif QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration(); for (int i = 0; i < treeWidget->topLevelItemCount(); ++i) { QTreeWidgetItem *item = treeWidget->topLevelItem(i); @@ -104,7 +102,7 @@ BearerMonitor::BearerMonitor(QWidget *parent) connect(newSessionButton, SIGNAL(clicked()), this, SLOT(createNewSession())); -#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) +#ifndef MAEMO_UI connect(deleteSessionButton, SIGNAL(clicked()), this, SLOT(deleteSession())); #endif @@ -257,15 +255,9 @@ void BearerMonitor::updateConfigurations() void BearerMonitor::onlineStateChanged(bool isOnline) { if (isOnline) -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) - QMessageBox::information(this, "Connection state changed", "Online", QMessageBox::Close); - else - QMessageBox::information(this, "Connection state changed", "Offline", QMessageBox::Close); -#else onlineState->setText(tr("Online")); else onlineState->setText(tr("Offline")); -#endif } #ifdef Q_OS_WIN @@ -393,7 +385,7 @@ void BearerMonitor::createSessionFor(QTreeWidgetItem *item) tabWidget->addTab(session, conf.name()); -#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) +#ifndef MAEMO_UI sessionGroup->show(); #endif @@ -408,7 +400,7 @@ void BearerMonitor::createNewSession() createSessionFor(item); } -#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) +#ifndef MAEMO_UI void BearerMonitor::deleteSession() { SessionWidget *session = qobject_cast<SessionWidget *>(tabWidget->currentWidget()); diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h index 45e7275..df1c78b 100644 --- a/examples/network/bearermonitor/bearermonitor.h +++ b/examples/network/bearermonitor/bearermonitor.h @@ -45,7 +45,7 @@ #include <qnetworksession.h> #if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) #include "ui_bearermonitor_240_320.h" -#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#elif defined(MAEMO_UI) #include "ui_bearermonitor_maemo.h" #else #include "ui_bearermonitor_640_480.h" @@ -81,7 +81,7 @@ private slots: void createSessionFor(QTreeWidgetItem *item); void createNewSession(); -#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) +#ifndef MAEMO_UI void deleteSession(); #endif void performScan(); diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index 4b2c35b..bd9bd68 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -8,7 +8,8 @@ SOURCES = main.cpp \ bearermonitor.cpp \ sessionwidget.cpp -maemo5|maemo6 { +maemo5|maemo6|linux-g++-maemo { + DEFINES += MAEMO_UI FORMS = bearermonitor_maemo.ui \ sessionwidget_maemo.ui } else { diff --git a/examples/network/bearermonitor/bearermonitor_maemo.ui b/examples/network/bearermonitor/bearermonitor_maemo.ui index a7940c6..9c72bfd 100644 --- a/examples/network/bearermonitor/bearermonitor_maemo.ui +++ b/examples/network/bearermonitor/bearermonitor_maemo.ui @@ -7,300 +7,359 @@ <x>0</x> <y>0</y> <width>612</width> - <height>495</height> + <height>555</height> </rect> </property> <property name="windowTitle"> <string>BearerMonitor</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0"> <item> - <widget class="QTabWidget" name="tabWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QGroupBox" name="systemState"> + <property name="title"> + <string>System State</string> </property> - <property name="currentIndex"> - <number>0</number> + <property name="flat"> + <bool>true</bool> </property> - <property name="usesScrollButtons"> - <bool>false</bool> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="onlineStateLabel"> + <property name="text"> + <string>Online State:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="onlineState"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="configurations"> + <property name="title"> + <string>Configurations && Sessions</string> </property> - <widget class="QWidget" name="tab"> - <attribute name="title"> - <string>Configurations</string> - </attribute> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QTreeWidget" name="treeWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <attribute name="headerVisible"> - <bool>false</bool> + <property name="flat"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="currentIndex"> + <number>0</number> + </property> + <property name="usesScrollButtons"> + <bool>false</bool> + </property> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>Configurations</string> </attribute> - <column> - <property name="text"> - <string>1</string> - </property> - </column> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QHBoxLayout" name="configurationNameLayout"> - <item> - <widget class="QLabel" name="configurationNameLabel"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationName"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="configurationStateLayout"> - <item> - <widget class="QLabel" name="configurationStateLabel"> - <property name="text"> - <string>State:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationState"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="configurationTypeLayout"> - <item> - <widget class="QLabel" name="configurationTypeLabel"> - <property name="text"> - <string>Type:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationType"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Invalid</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="configurationPurposeLayout"> - <item> - <widget class="QLabel" name="configurationPurposeLabel"> - <property name="text"> - <string>Purpose:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationPurpose"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Unknown</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="configurationIdentifierLayout"> - <item> - <widget class="QLabel" name="configurationIdentifierLabel"> - <property name="text"> - <string>Identifier:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationIdentifier"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="configurationRoamingLayout"> - <item> - <widget class="QLabel" name="configurationRoamingLabel"> - <property name="text"> - <string>Roaming:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationRoaming"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="configurationChildrenLayout"> - <item> - <widget class="QLabel" name="configurationChildrenLabel"> - <property name="text"> - <string>Children:</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="configurationChildren"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QTreeWidget" name="treeWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <attribute name="headerVisible"> + <bool>false</bool> + </attribute> + <column> <property name="text"> - <string/> + <string>1</string> </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="nlaGroup"> - <property name="title"> - <string>Network Location Awareness</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> + </column> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="configurationNameLayout"> + <item> + <widget class="QLabel" name="configurationNameLabel"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="configurationStateLayout"> + <item> + <widget class="QLabel" name="configurationStateLabel"> + <property name="text"> + <string>State:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationState"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="configurationTypeLayout"> + <item> + <widget class="QLabel" name="configurationTypeLabel"> + <property name="text"> + <string>Type:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationType"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Invalid</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="configurationPurposeLayout"> + <item> + <widget class="QLabel" name="configurationPurposeLabel"> + <property name="text"> + <string>Purpose:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationPurpose"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Unknown</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="configurationIdentifierLayout"> + <item> + <widget class="QLabel" name="configurationIdentifierLabel"> + <property name="text"> + <string>Identifier:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationIdentifier"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="configurationRoamingLayout"> + <item> + <widget class="QLabel" name="configurationRoamingLabel"> + <property name="text"> + <string>Roaming:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationRoaming"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="configurationChildrenLayout"> + <item> + <widget class="QLabel" name="configurationChildrenLabel"> + <property name="text"> + <string>Children:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="configurationChildren"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="nlaGroup"> + <property name="title"> + <string>Network Location Awareness</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="registerButton"> + <property name="text"> + <string>Register</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="unregisterButton"> + <property name="text"> + <string>Unregister</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> <item> - <widget class="QPushButton" name="registerButton"> + <widget class="QPushButton" name="newSessionButton"> <property name="text"> - <string>Register</string> + <string>New Session</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="unregisterButton"> + <widget class="QPushButton" name="deleteSessionButton"> <property name="text"> - <string>Unregister</string> + <string>Delete Session</string> </property> </widget> </item> + <item> + <widget class="QPushButton" name="scanButton"> + <property name="text"> + <string>Scan</string> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="progressBar"> + <property name="maximum"> + <number>0</number> + </property> + <property name="value"> + <number>23280</number> + </property> + <property name="textVisible"> + <bool>false</bool> + </property> + <property name="invertedAppearance"> + <bool>false</bool> + </property> + <property name="format"> + <string>%p%</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> - </widget> - </item> - <item> - <widget class="QPushButton" name="newSessionButton"> - <property name="text"> - <string>New Session</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="deleteSessionButton"> - <property name="text"> - <string>Delete Session</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="scanButton"> - <property name="text"> - <string>Scan</string> - </property> - </widget> - </item> - <item> - <widget class="QProgressBar" name="progressBar"> - <property name="maximum"> - <number>0</number> - </property> - <property name="value"> - <number>23280</number> - </property> - <property name="textVisible"> - <bool>false</bool> - </property> - <property name="invertedAppearance"> - <bool>false</bool> - </property> - <property name="format"> - <string>%p%</string> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - </layout> - </widget> + </item> + </layout> + </widget> + </widget> + </item> + </layout> </widget> </item> </layout> diff --git a/examples/network/bearermonitor/main.cpp b/examples/network/bearermonitor/main.cpp index 1a22c13..11399e4 100644 --- a/examples/network/bearermonitor/main.cpp +++ b/examples/network/bearermonitor/main.cpp @@ -38,7 +38,8 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QtGui/QApplication> +#include <QtGui/QMainWindow> #include "bearermonitor.h" @@ -46,8 +47,12 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); + QMainWindow mainWindow; + BearerMonitor monitor; - monitor.show(); + + mainWindow.setCentralWidget(&monitor); + mainWindow.show(); return app.exec(); } diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp index 5ec9d53..51de0f2 100644 --- a/examples/network/bearermonitor/sessionwidget.cpp +++ b/examples/network/bearermonitor/sessionwidget.cpp @@ -74,7 +74,7 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren this, SLOT(closeSession())); connect(stopSessionButton, SIGNAL(clicked()), this, SLOT(stopSession())); -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#ifdef MAEMO_UI connect(deleteSessionButton, SIGNAL(clicked()), this, SLOT(deleteSession())); #endif @@ -94,7 +94,7 @@ void SessionWidget::timerEvent(QTimerEvent *e) } } -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#ifdef MAEMO_UI void SessionWidget::deleteSession() { delete this; diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h index c92db44..846a1af 100644 --- a/examples/network/bearermonitor/sessionwidget.h +++ b/examples/network/bearermonitor/sessionwidget.h @@ -42,7 +42,8 @@ #define SESSIONWIDGET_H #include <qnetworksession.h> -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) + +#ifdef MAEMO_UI #include "ui_sessionwidget_maemo.h" #else #include "ui_sessionwidget.h" @@ -71,7 +72,7 @@ private Q_SLOTS: void stopSession(); void updateSession(); void updateSessionError(QNetworkSession::SessionError error); -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +#ifdef MAEMO_UI void deleteSession(); #endif diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index decec14..6d1f708 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -79,7 +79,6 @@ QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32 QMAKE_LIBS_OPENVG = -llibOpenVG -lfbscli -lbitgdi -lgdi QMAKE_LIBS_THREAD = -llibpthread QMAKE_LIBS_COMPAT = -QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon -leikcoctl exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { @@ -127,6 +126,8 @@ QT_ARCH = symbian load(qt_config) +QMAKE_LIBS_QT_ENTRY = -lqtmain$${QT_LIBINFIX}.lib + # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins QT_IMPORTS_BASE_DIR = /resource/qt/imports diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf index 0564e9b..348c366 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -3,9 +3,6 @@ load(default_post) contains(TEMPLATE, ".*app") { contains(CONFIG, stdbinary) { QMAKE_LIBS += - } else:contains(QT, gui):contains(CONFIG,qt) { - S60MAIN_LIBS = -leuser - QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS } else { QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY } diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 1a51cb2..20bc3a3 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -187,26 +187,16 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { linux-armcc: { QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\) - contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore - QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib - QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib - } else { - QMAKE_LIBS -= -llibcrt0.lib - QMAKE_LIBS += -llibcrt0.lib - } + QMAKE_LIBS -= $$QMAKE_LIBS_QT_ENTRY + QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY } else :linux-gcce { # notice that we can't merge these as ordering of arguments is important. QMAKE_LIBS += \ -l:eexe.lib \ -l:usrt2_2.lib - contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore - QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib - QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib - } else { - QMAKE_LIBS -= -l:libcrt0.lib - QMAKE_LIBS -= -l:libcrt0_gcce.lib - QMAKE_LIBS += -l:libcrt0_gcce.lib - } + modified_entry = $$replace(QMAKE_LIBS_QT_ENTRY, "^-l", "-l:") + QMAKE_LIBS -= $$modified_entry + QMAKE_LIBS += $$modified_entry QMAKE_LIBS += \ -l:dfpaeabi.dso \ -l:drtaeabi.dso \ diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 8ee42e7..e6c5fb9 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -88,6 +88,12 @@ #define CSIDL_APPDATA 0x001a // <username>\Application Data #endif +#ifdef Q_AUTOTEST_EXPORT +# define Q_AUTOTEST_EXPORT_HELPER Q_AUTOTEST_EXPORT +#else +# define Q_AUTOTEST_EXPORT_HELPER static +#endif + // ************************************************************************ // QConfFile @@ -134,7 +140,7 @@ QT_BEGIN_INCLUDE_NAMESPACE # include <sys/mount.h> QT_END_INCLUDE_NAMESPACE -static bool isLikelyToBeNfs(int handle) +Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle) { struct statfs buf; if (fstatfs(handle, &buf) != 0) @@ -160,7 +166,7 @@ QT_END_INCLUDE_NAMESPACE # define AUTOFSNG_SUPER_MAGIC 0x7d92b1a0 # endif -static bool isLikelyToBeNfs(int handle) +Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle) { struct statfs buf; if (fstatfs(handle, &buf) != 0) @@ -177,7 +183,7 @@ QT_BEGIN_INCLUDE_NAMESPACE # include <sys/statvfs.h> QT_END_INCLUDE_NAMESPACE -static bool isLikelyToBeNfs(int handle) +Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle) { struct statvfs buf; if (fstatvfs(handle, &buf) != 0) @@ -189,7 +195,7 @@ static bool isLikelyToBeNfs(int handle) #endif } #else -static inline bool isLikelyToBeNfs(int /* handle */) +Q_AUTOTEST_EXPORT_HELPER inline bool qIsLikelyToBeNfs(int /* handle */) { return true; } @@ -203,7 +209,7 @@ static bool unixLock(int handle, int lockType) now is to disable locking when we detect NFS (or AutoFS or CacheFS, which are probably wrapping NFS). */ - if (isLikelyToBeNfs(handle)) + if (qIsLikelyToBeNfs(handle)) return false; struct flock fl; diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp index 66f06e9..c297709 100644 --- a/src/corelib/tools/qpoint.cpp +++ b/src/corelib/tools/qpoint.cpp @@ -438,8 +438,12 @@ QDebug operator<<(QDebug d, const QPointF &p) /*! \fn bool QPointF::isNull() const - Returns true if both the x and y coordinates are set to 0.0, + Returns true if both the x and y coordinates are set to +0.0; otherwise returns false. + + \note Since this function treats +0.0 and -0.0 differently, points + with zero-valued coordinates where either or both values have a + negative sign are not defined to be null points. */ diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp index 20ac344..12287ab 100644 --- a/src/corelib/tools/qsize.cpp +++ b/src/corelib/tools/qsize.cpp @@ -492,9 +492,13 @@ QDebug operator<<(QDebug dbg, const QSize &s) { /*! \fn bool QSizeF::isNull() const - Returns true if both the width and height is 0; otherwise returns + Returns true if both the width and height are +0.0; otherwise returns false. + \note Since this function treats +0.0 and -0.0 differently, sizes with + zero width and height where either or both values have a negative + sign are not defined to be null sizes. + \sa isValid(), isEmpty() */ diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index bf771a8..f68a8ca 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -140,9 +140,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP \fn QDBusConnection &QDBusConnection::sessionBus() \relates QDBusConnection - Returns a QDBusConnection object opened with the session bus. The object reference returned - by this function is valid until the QCoreApplication's destructor is run, when the - connection will be closed and the object, deleted. + Returns a QDBusConnection object opened with the session bus. The object + reference returned by this function is valid until the application terminates, + at which point the connection will be closed and the object deleted. */ /*! \fn QDBusConnection &QDBusConnection::systemBus() diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index c58a08d..649c8fb 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -361,6 +361,8 @@ QDeclarativeScaleGrid *QDeclarativeBorderImage::border() \o BorderImage.Repeat - Tile the image until there is no more space. May crop the last image. \o BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped. \endlist + + The default tile mode for each property is BorderImage.Stretch. */ QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::horizontalTileMode() const { diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 1f1e93d..3b08a9b 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -259,8 +259,10 @@ void QDeclarativeImage::setFillMode(FillMode mode) \qmlproperty real Image::paintedHeight These properties hold the size of the image that is actually painted. - In most cases it is the same as \c width and \c height, but when using a \c fillMode like - \c PreserveAspectFit \c paintedWidth or \c paintedHeight can be smaller than \c width and \c height. + In most cases it is the same as \c width and \c height, but when using a + \c fillMode \c PreserveAspectFit or \c fillMode \c PreserveAspectCrop + \c paintedWidth or \c paintedHeight can be smaller or larger than + \c width and \c height of the Image element. */ qreal QDeclarativeImage::paintedWidth() const { @@ -399,6 +401,19 @@ void QDeclarativeImage::updatePaintedGeometry() if (heightValid() && !widthValid()) { setImplicitWidth(d->paintedWidth); } + } else if (d->fillMode == PreserveAspectCrop) { + if (!d->pix.width() || !d->pix.height()) + return; + qreal widthScale = width() / qreal(d->pix.width()); + qreal heightScale = height() / qreal(d->pix.height()); + if (widthScale < heightScale) { + widthScale = heightScale; + } else if(heightScale < widthScale) { + heightScale = widthScale; + } + + d->paintedHeight = heightScale * qreal(d->pix.height()); + d->paintedWidth = widthScale * qreal(d->pix.width()); } else { d->paintedWidth = width(); d->paintedHeight = height(); @@ -412,6 +427,12 @@ void QDeclarativeImage::geometryChanged(const QRectF &newGeometry, const QRectF updatePaintedGeometry(); } +QRectF QDeclarativeImage::boundingRect() const +{ + Q_D(const QDeclarativeImage); + return QRectF(0, 0, qMax(d->mWidth, d->paintedWidth), qMax(d->mHeight, d->paintedHeight)); +} + /*! \qmlproperty url Image::source @@ -496,7 +517,7 @@ void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWi } if (clip()) { p->save(); - p->setClipRect(boundingRect(), Qt::IntersectClip); + p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip); } scale.scale(widthScale, heightScale); QTransform old = p->transform(); diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h index c8bb30b..0e8034e 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h @@ -76,6 +76,7 @@ public: qreal paintedHeight() const; void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); + QRectF boundingRect() const; Q_SIGNALS: void fillModeChanged(); diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 84f276e..615c619 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -285,35 +285,56 @@ QSize QDeclarativeTextPrivate::setupTextLayout() { // ### text layout handling should be profiled and optimized as needed // what about QStackTextEngine engine(tmp, d->font.font()); QTextLayout textLayout(&engine); - Q_Q(QDeclarativeText); layout.setCacheEnabled(true); qreal height = 0; + qreal widthUsed = 0; qreal lineWidth = 0; - QTextOption textOption = layout.textOption(); - textOption.setWrapMode(QTextOption::NoWrap); - textOption.setAlignment(Qt::Alignment(hAlign)); - - // if the item has an explicit width, we set the line width and enable wrapping - if (q->widthValid()) { + //set manual width + if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid()) lineWidth = q->width(); - textOption.setWrapMode(QTextOption::WrapMode(wrapMode)); - } + QTextOption textOption = layout.textOption(); + textOption.setWrapMode(QTextOption::WrapMode(wrapMode)); layout.setTextOption(textOption); + layout.beginLayout(); - while (1) { + forever { QTextLine line = layout.createLine(); if (!line.isValid()) break; - line.setLineWidth(lineWidth); + if (lineWidth) + line.setLineWidth(lineWidth); + } + layout.endLayout(); + + for (int i = 0; i < layout.lineCount(); ++i) { + QTextLine line = layout.lineAt(i); + widthUsed = qMax(widthUsed, line.naturalTextWidth()); + } + + qreal layoutWidth = q->widthValid() ? q->width() : widthUsed; + + qreal x = 0; + for (int i = 0; i < layout.lineCount(); ++i) { + QTextLine line = layout.lineAt(i); line.setPosition(QPointF(0, height)); height += line.height(); + + if (!cacheAllTextAsImage) { + if (hAlign == QDeclarativeText::AlignLeft) { + x = 0; + } else if (hAlign == QDeclarativeText::AlignRight) { + x = layoutWidth - line.naturalTextWidth(); + } else if (hAlign == QDeclarativeText::AlignHCenter) { + x = (layoutWidth - line.naturalTextWidth()) / 2; + } + line.setPosition(QPointF(x, line.y())); + } } - layout.endLayout(); return layout.boundingRect().toAlignedRect().size(); } @@ -327,6 +348,19 @@ QPixmap QDeclarativeTextPrivate::textLayoutImage(bool drawStyle) //do layout QSize size = layedOutTextSize; + qreal x = 0; + for (int i = 0; i < layout.lineCount(); ++i) { + QTextLine line = layout.lineAt(i); + if (hAlign == QDeclarativeText::AlignLeft) { + x = 0; + } else if (hAlign == QDeclarativeText::AlignRight) { + x = size.width() - line.naturalTextWidth(); + } else if (hAlign == QDeclarativeText::AlignHCenter) { + x = (size.width() - line.naturalTextWidth()) / 2; + } + line.setPosition(QPointF(x, line.y())); + } + //paint text QPixmap img(size); if (!size.isEmpty()) { diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index abaaa49..ce27bd3 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -561,6 +561,9 @@ void QInputDialog::setLabelText(const QString &text) } else { d->label->setText(text); } +#ifdef Q_OS_SYMBIAN + d->label->setWordWrap(true); +#endif } QString QInputDialog::labelText() const diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index 0dd4e99..f9c2e0c 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -66,27 +66,36 @@ static inline int hex2byte(register char *p) static bool read_xbm_header(QIODevice *device, int& w, int& h) { const int buflen = 300; + const int maxlen = 4096; char buf[buflen + 1]; QRegExp r1(QLatin1String("^#define[ \t]+[a-zA-Z0-9._]+[ \t]+")); QRegExp r2(QLatin1String("[0-9]+")); qint64 readBytes = 0; + qint64 totalReadBytes = 0; - // "#define .._width <num>" - readBytes = device->readLine(buf, buflen); - if (readBytes <= 0) - return false; - buf[readBytes - 1] = '\0'; + buf[0] = '\0'; // skip initial comment, if any - while (buf[0] != '#' && (readBytes = device->readLine( buf, buflen )) > 0) {} + while (buf[0] != '#') { + readBytes = device->readLine(buf, buflen); + + // if readBytes >= buflen, it's very probably not a C file + if (readBytes <= 0 || readBytes >= buflen -1) + return false; + + // limit xbm headers to the first 4k in the file to prevent + // excessive reads on non-xbm files + totalReadBytes += readBytes; + if (totalReadBytes >= maxlen) + return false; + } - if (readBytes <= 0) - return false; buf[readBytes - 1] = '\0'; QString sbuf; sbuf = QString::fromLatin1(buf); + // "#define .._width <num>" if (r1.indexIn(sbuf) == 0 && r2.indexIn(sbuf, r1.matchedLength()) == r1.matchedLength()) w = QByteArray(&buf[r1.matchedLength()]).trimmed().toInt(); diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 6c4004e..a4ae46b 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -1430,10 +1430,18 @@ QStyle *QApplication::style() // Compile-time search for default style // QString style; - if (!QApplicationPrivate::styleOverride.isEmpty()) +#ifdef QT_BUILD_INTERNAL + QString envStyle = QString::fromLocal8Bit(qgetenv("QT_STYLE_OVERRIDE")); +#else + QString envStyle; +#endif + if (!QApplicationPrivate::styleOverride.isEmpty()) { style = QApplicationPrivate::styleOverride; - else + } else if (!envStyle.isEmpty()) { + style = envStyle; + } else { style = QApplicationPrivate::desktopStyleKey(); + } QStyle *&app_style = QApplicationPrivate::app_style; app_style = QStyleFactory::create(style); diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index a4cc5a3..7c68170 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -2334,6 +2334,30 @@ void qt_init(QApplicationPrivate *priv, int, X11->desktopEnvironment = DE_4DWM; break; } + + if (XGetWindowProperty(X11->display, QX11Info::appRootWindow(), + ATOM(_NET_SUPPORTING_WM_CHECK), + 0, 1024, False, XA_WINDOW, &type, + &format, &length, &after, &data) == Success) { + if (type == XA_WINDOW && format == 32) { + Window windowManagerWindow = *((Window*) data); + XFree(data); + data = 0; + + if (windowManagerWindow != XNone) { + Atom utf8atom = ATOM(UTF8_STRING); + if (XGetWindowProperty(QX11Info::display(), windowManagerWindow, ATOM(_NET_WM_NAME), + 0, 1024, False, utf8atom, &type, + &format, &length, &after, &data) == Success) { + if (type == utf8atom && format == 8) { + if (qstrcmp((const char *)data, "MCompositor") == 0) + X11->desktopEnvironment = DE_MEEGO_COMPOSITOR; + } + } + } + } + } + } while(0); if (data) diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index d62d9c3..56c8094 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -338,6 +338,7 @@ enum DesktopEnvironment { DE_KDE, DE_GNOME, DE_CDE, + DE_MEEGO_COMPOSITOR, DE_4DWM }; diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 53ca28c..f3fb2f5 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -112,8 +112,6 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = { // *** End of generated data *** }; -QSet<const QWidget *> *QS60StylePrivate::m_autoFillDisabledWidgets = 0; - const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0]; // theme background texture @@ -154,8 +152,6 @@ const double KTabFontMul = 0.72; QS60StylePrivate::~QS60StylePrivate() { - delete m_autoFillDisabledWidgets; - m_autoFillDisabledWidgets = 0; clearCaches(); //deletes also background image deleteThemePalette(); #ifdef Q_WS_S60 @@ -3188,13 +3184,6 @@ void QS60Style::polish(QWidget *widget) } d->setThemePalette(widget); d->setFont(widget); - - if (widget->autoFillBackground()) { - if (!d->m_autoFillDisabledWidgets) - d->m_autoFillDisabledWidgets = new QSet<const QWidget *>; - widget->setAutoFillBackground(false); - d->m_autoFillDisabledWidgets->insert(widget); - } } /*! @@ -3229,13 +3218,6 @@ void QS60Style::unpolish(QWidget *widget) if (widget) widget->setPalette(QPalette()); - - if (d->m_autoFillDisabledWidgets && - !d->m_autoFillDisabledWidgets->isEmpty() && - d->m_autoFillDisabledWidgets->contains(widget)) { - widget->setAutoFillBackground(true); - d->m_autoFillDisabledWidgets->remove(widget); - } #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR) if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) { diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index 3d66c40..b46f75e 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -625,7 +625,6 @@ private: static qint64 m_webPaletteKey; static QPointer<QWidget> m_pressedWidget; - static QSet<const QWidget *> *m_autoFillDisabledWidgets; #ifdef Q_WS_S60 //list of progress bars having animation running diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 4e5de53..02daa50 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -412,7 +412,9 @@ void QHttpNetworkConnectionChannel::_q_receiveReply() } case QHttpNetworkReplyPrivate::ReadingDataState: { QHttpNetworkReplyPrivate *replyPrivate = reply->d_func(); - if (replyPrivate->downstreamLimited && !replyPrivate->responseData.isEmpty() && replyPrivate->shouldEmitSignals()) { + if (socket->state() == QAbstractSocket::ConnectedState && + replyPrivate->downstreamLimited && !replyPrivate->responseData.isEmpty() && replyPrivate->shouldEmitSignals()) { + // (only do the following when still connected, not when we have already been disconnected and there is still data) // We already have some HTTP body data. We don't read more from the socket until // this is fetched by QHttpNetworkAccessHttpBackend. If we would read more, // we could not limit our read buffer usage. @@ -421,7 +423,6 @@ void QHttpNetworkConnectionChannel::_q_receiveReply() // to the read buffer maximum size, but we don't care since they should be small. return; } - if (!replyPrivate->isChunked() && !replyPrivate->autoDecompress && replyPrivate->bodyLength > 0) { // bulk files like images should fulfill these properties and diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index bc5a025..84f9517 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -426,7 +426,8 @@ template<> void QSharedDataPointer<QNetworkProxyPrivate>::detach() QNetworkProxy::QNetworkProxy() : d(0) { - globalNetworkProxy()->init(); + if (QGlobalNetworkProxy *globalProxy = globalNetworkProxy()) + globalProxy->init(); } /*! @@ -441,7 +442,8 @@ QNetworkProxy::QNetworkProxy(ProxyType type, const QString &hostName, quint16 po const QString &user, const QString &password) : d(new QNetworkProxyPrivate(type, hostName, port, user, password)) { - globalNetworkProxy()->init(); + if (QGlobalNetworkProxy *globalProxy = globalNetworkProxy()) + globalProxy->init(); } /*! diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp index 559a6fd..167a7d2 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp @@ -63,8 +63,9 @@ QGLRect QGL2PEXVertexArray::boundingRect() const void QGL2PEXVertexArray::addClosingLine(int index) { - if (QPointF(vertexArray.at(index)) != QPointF(vertexArray.last())) - vertexArray.add(vertexArray.at(index)); + QPointF point(vertexArray.at(index)); + if (point != QPointF(vertexArray.last())) + vertexArray.add(point); } void QGL2PEXVertexArray::addCentroid(const QVectorPath &path, int subPathIndex) diff --git a/src/plugins/bearer/icd/maemo_icd.cpp b/src/plugins/bearer/icd/maemo_icd.cpp index 4f879e3..57ab0a8 100644 --- a/src/plugins/bearer/icd/maemo_icd.cpp +++ b/src/plugins/bearer/icd/maemo_icd.cpp @@ -508,6 +508,7 @@ uint IcdPrivate::state(QList<IcdStateResult>& state_results) mInterface.clear(); while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) { mDBus->synchronousDispatch(1000); + QCoreApplication::sendPostedEvents(icd, QEvent::MetaCall); } if (time(0)>(started+timeout_secs)) { @@ -685,6 +686,7 @@ uint IcdPrivate::addrinfo(QList<IcdAddressInfoResult>& addr_results) mInterface.clear(); while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) { mDBus->synchronousDispatch(1000); + QCoreApplication::sendPostedEvents(icd, QEvent::MetaCall); } if (time(0)>(started+timeout_secs)) { diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp index 37434e3..8d0f587 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp @@ -679,7 +679,7 @@ void QNetworkSessionPrivateImpl::open() if (serviceConfig.isValid()) { lastError = QNetworkSession::OperationNotSupportedError; emit QNetworkSessionPrivate::error(lastError); - } else if (!isOpen) { + } else if (!opened) { if (publicConfig.type() == QNetworkConfiguration::UserChoice) { /* Caller is trying to connect to default IAP. * At this time we will not know the IAP details so we just diff --git a/src/s60installs/bwins/QtOpenVGu.def b/src/s60installs/bwins/QtOpenVGu.def index a67725e..87b9c7f 100644 --- a/src/s60installs/bwins/QtOpenVGu.def +++ b/src/s60installs/bwins/QtOpenVGu.def @@ -175,4 +175,5 @@ EXPORTS ?createPixmapForImage@QVGPixmapData@@IAEXAAVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@_N@Z @ 174 NONAME ; void QVGPixmapData::createPixmapForImage(class QImage &, class QFlags<enum Qt::ImageConversionFlag>, bool) ?fromData@QVGPixmapData@@UAE_NPBEIPBDV?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 175 NONAME ; bool QVGPixmapData::fromData(unsigned char const *, unsigned int, char const *, class QFlags<enum Qt::ImageConversionFlag>) ?fromImageReader@QVGPixmapData@@UAEXPAVQImageReader@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 176 NONAME ; void QVGPixmapData::fromImageReader(class QImageReader *, class QFlags<enum Qt::ImageConversionFlag>) + ?canVgWritePixels@QVGPaintEngine@@ABE_NABVQImage@@@Z @ 177 NONAME ; bool QVGPaintEngine::canVgWritePixels(class QImage const &) const diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def index 99942b8..e1828c1 100644 --- a/src/s60installs/eabi/QtOpenVGu.def +++ b/src/s60installs/eabi/QtOpenVGu.def @@ -205,4 +205,5 @@ EXPORTS _ZN13QVGPixmapData20createPixmapForImageER6QImage6QFlagsIN2Qt19ImageConversionFlagEEb @ 204 NONAME _ZN13QVGPixmapData8fromDataEPKhjPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 205 NONAME _ZN13QVGPixmapData8fromFileERK7QStringPKc6QFlagsIN2Qt19ImageConversionFlagEE @ 206 NONAME + _ZNK14QVGPaintEngine16canVgWritePixelsERK6QImage @ 207 NONAME diff --git a/tests/auto/declarative/qdeclarativeimage/data/rect.png b/tests/auto/declarative/qdeclarativeimage/data/rect.png Binary files differnew file mode 100644 index 0000000..d564a2d --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimage/data/rect.png diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index f1e026f..bf779ad 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -80,6 +80,8 @@ private slots: void preserveAspectRatio(); void smooth(); void svg(); + void geometry(); + void geometry_data(); void big(); void tiling_QTBUG_6716(); void noLoading(); @@ -288,6 +290,78 @@ void tst_qdeclarativeimage::svg() delete obj; } +void tst_qdeclarativeimage::geometry_data() +{ + QTest::addColumn<QString>("fillMode"); + QTest::addColumn<bool>("explicitWidth"); + QTest::addColumn<bool>("explicitHeight"); + QTest::addColumn<double>("itemWidth"); + QTest::addColumn<double>("paintedWidth"); + QTest::addColumn<double>("boundingWidth"); + QTest::addColumn<double>("itemHeight"); + QTest::addColumn<double>("paintedHeight"); + QTest::addColumn<double>("boundingHeight"); + + // tested image has width 200, height 100 + + // bounding rect and item rect are equal with fillMode PreserveAspectFit, painted rect may be smaller if the aspect ratio doesn't match + QTest::newRow("PreserveAspectFit") << "PreserveAspectFit" << false << false << 200.0 << 200.0 << 200.0 << 100.0 << 100.0 << 100.0; + QTest::newRow("PreserveAspectFit explicit width 300") << "PreserveAspectFit" << true << false << 300.0 << 200.0 << 300.0 << 100.0 << 100.0 << 100.0; + QTest::newRow("PreserveAspectFit explicit height 400") << "PreserveAspectFit" << false << true << 200.0 << 200.0 << 200.0 << 400.0 << 100.0 << 400.0; + QTest::newRow("PreserveAspectFit explicit width 300, height 400") << "PreserveAspectFit" << true << true << 300.0 << 300.0 << 300.0 << 400.0 << 150.0 << 400.0; + + // bounding rect and painted rect are equal with fillMode PreserveAspectCrop, item rect may be smaller if the aspect ratio doesn't match + QTest::newRow("PreserveAspectCrop") << "PreserveAspectCrop" << false << false << 200.0 << 200.0 << 200.0 << 100.0 << 100.0 << 100.0; + QTest::newRow("PreserveAspectCrop explicit width 300") << "PreserveAspectCrop" << true << false << 300.0 << 300.0 << 300.0 << 100.0 << 150.0 << 150.0; + QTest::newRow("PreserveAspectCrop explicit height 400") << "PreserveAspectCrop" << false << true << 200.0 << 800.0 << 800.0 << 400.0 << 400.0 << 400.0; + QTest::newRow("PreserveAspectCrop explicit width 300, height 400") << "PreserveAspectCrop" << true << true << 300.0 << 800.0 << 800.0 << 400.0 << 400.0 << 400.0; + + // bounding rect, painted rect and item rect are equal in stretching and tiling images + QStringList fillModes; + fillModes << "Stretch" << "Tile" << "TileVertically" << "TileHorizontally"; + foreach (QString fillMode, fillModes) { + QTest::newRow(fillMode.toLatin1()) << fillMode << false << false << 200.0 << 200.0 << 200.0 << 100.0 << 100.0 << 100.0; + QTest::newRow(QString(fillMode + " explicit width 300").toLatin1()) << fillMode << true << false << 300.0 << 300.0 << 300.0 << 100.0 << 100.0 << 100.0; + QTest::newRow(QString(fillMode + " explicit height 400").toLatin1()) << fillMode << false << true << 200.0 << 200.0 << 200.0 << 400.0 << 400.0 << 400.0; + QTest::newRow(QString(fillMode + " explicit width 300, height 400").toLatin1()) << fillMode << true << true << 300.0 << 300.0 << 300.0 << 400.0 << 400.0 << 400.0; + } +} + +void tst_qdeclarativeimage::geometry() +{ + QFETCH(QString, fillMode); + QFETCH(bool, explicitWidth); + QFETCH(bool, explicitHeight); + QFETCH(double, itemWidth); + QFETCH(double, itemHeight); + QFETCH(double, paintedWidth); + QFETCH(double, paintedHeight); + QFETCH(double, boundingWidth); + QFETCH(double, boundingHeight); + + QString src = QUrl::fromLocalFile(SRCDIR "/data/rect.png").toString(); + QString componentStr = "import QtQuick 1.0\nImage { source: \"" + src + "\"; fillMode: Image." + fillMode + "; "; + + if (explicitWidth) + componentStr.append("width: 300; "); + if (explicitHeight) + componentStr.append("height: 400; "); + componentStr.append("}"); + QDeclarativeComponent component(&engine); + component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); + QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create()); + QVERIFY(obj != 0); + + QCOMPARE(obj->width(), itemWidth); + QCOMPARE(obj->paintedWidth(), paintedWidth); + QCOMPARE(obj->boundingRect().width(), boundingWidth); + + QCOMPARE(obj->height(), itemHeight); + QCOMPARE(obj->paintedHeight(), paintedHeight); + QCOMPARE(obj->boundingRect().height(), boundingHeight); + delete obj; +} + void tst_qdeclarativeimage::big() { // If the JPEG loader does not implement scaling efficiently, it would diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png Binary files differindex 5243f4a..8b6329d 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml index ad7f35e..85c0cce 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 32 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 48 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 64 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 80 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 96 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 112 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 128 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 144 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 160 - hash: "5033bd624cd855ba10da39e6cb30e7d2" + hash: "75c15f88551f961727b547082216d0bb" } Frame { msec: 176 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 192 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 208 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 224 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 240 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 256 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 272 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 288 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 304 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 320 - hash: "d0d1afd7d8ff38e033cec4fa68978767" + hash: "1a58de7b864ae75e65f69461155cbfb2" } Frame { msec: 336 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 352 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 368 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 384 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 400 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 416 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 432 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 448 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 464 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 480 - hash: "26eed73af37b01ebecb4ee98ed9d67c6" + hash: "8a6b615ce522e7aa1011bc1d16193871" } Frame { msec: 496 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 512 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 528 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 544 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 560 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 576 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 592 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 608 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 624 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 640 - hash: "f046b9aaa9f1eba08386a160e2f281ca" + hash: "17141b7167d2249238c15cf751b3d8b6" } Frame { msec: 656 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 672 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 688 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 704 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 720 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 736 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 752 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 768 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 784 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 800 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 816 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 832 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 848 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 864 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 880 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 896 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 912 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 928 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 944 - hash: "52f90c22e44475fac04559164c044aee" + hash: "92e4f7c09e41b5fb97feb0093e8d9c1f" } Frame { msec: 960 diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml index 56527d1..d7428dd 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml @@ -6,126 +6,126 @@ VisualTest { } Frame { msec: 16 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 32 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 48 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 64 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 80 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 96 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 112 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 128 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 144 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 160 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 176 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 192 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 208 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 224 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 240 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 256 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 272 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 288 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 304 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 320 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 336 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 352 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 368 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 384 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 400 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 416 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 432 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 448 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 464 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 480 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } Frame { msec: 496 - hash: "01ef07707e44ea079350128454209892" + hash: "80e9ca4c4ffac9c032334a3369ef9db6" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png Binary files differindex a947584..7547856 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml index 940d3c1..6b9986f 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 32 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 48 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 64 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 80 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 96 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 112 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 128 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 144 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 160 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 176 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 192 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 208 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 224 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 240 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 256 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 272 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 288 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 304 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 320 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 336 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 352 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 368 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 384 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 400 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 416 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 432 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 448 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 464 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 480 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 496 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 512 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 528 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 544 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 560 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 576 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 592 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 608 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 624 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 640 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 656 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 672 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 688 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 704 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 720 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 736 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 752 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 768 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 784 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 800 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 816 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 832 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 848 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 864 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 880 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 896 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 912 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 928 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 944 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 960 @@ -246,15 +246,15 @@ VisualTest { } Frame { msec: 976 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 992 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 1008 - hash: "f5b2ec4a5220eabe1186bb2fd65a7263" + hash: "35c278720fd30e14dce9cf8684dd2cd7" } Frame { msec: 1024 @@ -444,276 +444,4 @@ VisualTest { msec: 1760 hash: "eee4600ac08b458ac7ac2320e225674c" } - Frame { - msec: 1776 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1792 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1808 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1824 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1840 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1856 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1872 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1888 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1904 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1920 - image: "qtbug_14865.1.png" - } - Frame { - msec: 1936 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1952 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1968 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 1984 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2000 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2016 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2032 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2048 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2064 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2080 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2096 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2112 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2128 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2144 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2160 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2176 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2192 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2208 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2224 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2240 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2256 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Key { - type: 6 - key: 16777249 - modifiers: 0 - text: "" - autorep: false - count: 1 - } - Frame { - msec: 2272 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2288 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2304 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2320 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2336 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2352 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2368 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2384 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2400 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2416 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2432 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2448 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2464 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2480 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2496 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2512 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2528 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2544 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2560 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2576 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2592 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2608 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2624 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2640 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2656 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2672 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2688 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2704 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2720 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2736 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2752 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2768 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2784 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2800 - hash: "eee4600ac08b458ac7ac2320e225674c" - } - Frame { - msec: 2816 - hash: "eee4600ac08b458ac7ac2320e225674c" - } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png Binary files differindex 91ee2e5..88e065b 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml index 718375a..96144e1 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 32 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 48 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 64 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 80 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 96 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 112 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 128 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 144 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 160 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 176 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 192 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 208 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 224 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 240 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 256 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 272 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 288 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 304 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 320 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 336 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 352 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 368 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 384 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 400 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 416 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 432 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 448 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 464 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 480 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 496 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 512 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 528 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 544 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 560 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 576 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 592 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 608 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 624 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 640 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 656 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 672 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 688 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 704 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 720 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 736 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 752 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 768 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 784 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 800 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 816 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 832 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 848 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 864 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 880 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 896 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 912 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 928 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 944 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 960 @@ -246,34 +246,34 @@ VisualTest { } Frame { msec: 976 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Key { type: 6 key: 16777249 - modifiers: 67108864 + modifiers: 0 text: "" autorep: false count: 1 } Frame { msec: 992 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 1008 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 1024 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 1040 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } Frame { msec: 1056 - hash: "10e33a5f4c2161281d5a6b4481a17921" + hash: "7d056af7620fe8387955a1401a4f088a" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png Binary files differindex 0f9a0aa..4df514a 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png Binary files differindex f3bb7b9..e752fec 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png Binary files differindex b2f09de..d2f8633 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png Binary files differindex bca63db..0162321 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml index 48a0ff4..b531942 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/elide2.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 32 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 48 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 64 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 80 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 96 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 112 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 128 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 144 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 160 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 176 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 192 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 208 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 224 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 240 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 256 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 272 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 288 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 304 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 320 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 336 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 352 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 368 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 384 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 400 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 416 - hash: "083c607c9b66240f445611a18f3025b3" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 432 - hash: "57993cfe25ba9e6f3dcdcea5fab6545c" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 448 - hash: "57993cfe25ba9e6f3dcdcea5fab6545c" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 464 - hash: "57993cfe25ba9e6f3dcdcea5fab6545c" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 480 - hash: "45086d8e81c178855fc1e8fd283b7157" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 496 - hash: "45086d8e81c178855fc1e8fd283b7157" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 512 - hash: "45086d8e81c178855fc1e8fd283b7157" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 528 - hash: "45086d8e81c178855fc1e8fd283b7157" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 544 - hash: "45086d8e81c178855fc1e8fd283b7157" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 560 - hash: "45086d8e81c178855fc1e8fd283b7157" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 576 - hash: "c859ff5a516792a614008d0d3d096060" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 592 - hash: "c859ff5a516792a614008d0d3d096060" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 608 - hash: "c859ff5a516792a614008d0d3d096060" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 624 - hash: "c859ff5a516792a614008d0d3d096060" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 640 - hash: "c859ff5a516792a614008d0d3d096060" + hash: "90a45871fcfc509e60d4ee01527cde3b" } Frame { msec: 656 - hash: "02d4eb733c7249f2c38c1768a9988739" + hash: "c73bf21c0c9946e123372c660c78e7dd" } Frame { msec: 672 - hash: "02d4eb733c7249f2c38c1768a9988739" + hash: "c73bf21c0c9946e123372c660c78e7dd" } Frame { msec: 688 - hash: "f87a38e5ef6cfe9d5c131671fecb7903" + hash: "c73bf21c0c9946e123372c660c78e7dd" } Frame { msec: 704 - hash: "f87a38e5ef6cfe9d5c131671fecb7903" + hash: "bba29f9ce1a1d7dafdfe34b0ab952658" } Frame { msec: 720 - hash: "f87a38e5ef6cfe9d5c131671fecb7903" + hash: "bba29f9ce1a1d7dafdfe34b0ab952658" } Frame { msec: 736 - hash: "f87a38e5ef6cfe9d5c131671fecb7903" + hash: "bba29f9ce1a1d7dafdfe34b0ab952658" } Frame { msec: 752 - hash: "f87a38e5ef6cfe9d5c131671fecb7903" + hash: "bba29f9ce1a1d7dafdfe34b0ab952658" } Frame { msec: 768 - hash: "f87a38e5ef6cfe9d5c131671fecb7903" + hash: "bba29f9ce1a1d7dafdfe34b0ab952658" } Frame { msec: 784 - hash: "3262cf6b60e56028056b81db17cfef61" + hash: "26f95496c4f1fa217d681a1ae79eff86" } Frame { msec: 800 - hash: "3262cf6b60e56028056b81db17cfef61" + hash: "26f95496c4f1fa217d681a1ae79eff86" } Frame { msec: 816 - hash: "3262cf6b60e56028056b81db17cfef61" + hash: "26f95496c4f1fa217d681a1ae79eff86" } Frame { msec: 832 - hash: "31c337926e645ad93699a223c7ad223e" + hash: "26f95496c4f1fa217d681a1ae79eff86" } Frame { msec: 848 - hash: "31c337926e645ad93699a223c7ad223e" + hash: "96a83eae50a073573ace90239a64d326" } Frame { msec: 864 - hash: "31c337926e645ad93699a223c7ad223e" + hash: "96a83eae50a073573ace90239a64d326" } Frame { msec: 880 - hash: "31c337926e645ad93699a223c7ad223e" + hash: "7b15d75c611f24977f2a1b44ef9e16d8" } Frame { msec: 896 - hash: "31c337926e645ad93699a223c7ad223e" + hash: "7b15d75c611f24977f2a1b44ef9e16d8" } Frame { msec: 912 - hash: "64253f08448ad6884b76271afe7831ab" + hash: "7b15d75c611f24977f2a1b44ef9e16d8" } Frame { msec: 928 - hash: "64253f08448ad6884b76271afe7831ab" + hash: "7b15d75c611f24977f2a1b44ef9e16d8" } Frame { msec: 944 - hash: "64253f08448ad6884b76271afe7831ab" + hash: "7b15d75c611f24977f2a1b44ef9e16d8" } Frame { msec: 960 @@ -246,247 +246,247 @@ VisualTest { } Frame { msec: 976 - hash: "64253f08448ad6884b76271afe7831ab" + hash: "7b15d75c611f24977f2a1b44ef9e16d8" } Frame { msec: 992 - hash: "f463cbd97856cd3cb0316cfbbc4c960f" + hash: "7b000cccb4e4cdaa53b025d235478b1c" } Frame { msec: 1008 - hash: "f463cbd97856cd3cb0316cfbbc4c960f" + hash: "7b000cccb4e4cdaa53b025d235478b1c" } Frame { msec: 1024 - hash: "06731429ea2d012364b2fd6177e4fcb1" + hash: "18366b01550fdd4a7dc7305a6289ac9b" } Frame { msec: 1040 - hash: "06731429ea2d012364b2fd6177e4fcb1" + hash: "18366b01550fdd4a7dc7305a6289ac9b" } Frame { msec: 1056 - hash: "06731429ea2d012364b2fd6177e4fcb1" + hash: "18366b01550fdd4a7dc7305a6289ac9b" } Frame { msec: 1072 - hash: "06731429ea2d012364b2fd6177e4fcb1" + hash: "18366b01550fdd4a7dc7305a6289ac9b" } Frame { msec: 1088 - hash: "06731429ea2d012364b2fd6177e4fcb1" + hash: "18366b01550fdd4a7dc7305a6289ac9b" } Frame { msec: 1104 - hash: "a3f1acd84b5fc99e8ffa3c900013ca0d" + hash: "cde86069e7f9809ef2c88cc6ea83910b" } Frame { msec: 1120 - hash: "a3f1acd84b5fc99e8ffa3c900013ca0d" + hash: "cde86069e7f9809ef2c88cc6ea83910b" } Frame { msec: 1136 - hash: "a3f1acd84b5fc99e8ffa3c900013ca0d" + hash: "cde86069e7f9809ef2c88cc6ea83910b" } Frame { msec: 1152 - hash: "2cb79791e784739b5c4a12578df47205" + hash: "cde86069e7f9809ef2c88cc6ea83910b" } Frame { msec: 1168 - hash: "2cb79791e784739b5c4a12578df47205" + hash: "b8c7416944cb741ceb4ee0e8545037b1" } Frame { msec: 1184 - hash: "2cb79791e784739b5c4a12578df47205" + hash: "b8c7416944cb741ceb4ee0e8545037b1" } Frame { msec: 1200 - hash: "c040d9e9494193164206890e8dd79508" + hash: "b8c7416944cb741ceb4ee0e8545037b1" } Frame { msec: 1216 - hash: "c040d9e9494193164206890e8dd79508" + hash: "74a03bf98bb205d7962e0fcc025c4ed3" } Frame { msec: 1232 - hash: "c040d9e9494193164206890e8dd79508" + hash: "74a03bf98bb205d7962e0fcc025c4ed3" } Frame { msec: 1248 - hash: "daaa92c4049a1ef9d290d99b0c83306e" + hash: "74a03bf98bb205d7962e0fcc025c4ed3" } Frame { msec: 1264 - hash: "daaa92c4049a1ef9d290d99b0c83306e" + hash: "74a03bf98bb205d7962e0fcc025c4ed3" } Frame { msec: 1280 - hash: "daaa92c4049a1ef9d290d99b0c83306e" + hash: "0d286d7e274868e87f7de4367b69386e" } Frame { msec: 1296 - hash: "daaa92c4049a1ef9d290d99b0c83306e" + hash: "0d286d7e274868e87f7de4367b69386e" } Frame { msec: 1312 - hash: "daaa92c4049a1ef9d290d99b0c83306e" + hash: "892e9e8feeb15bbad5f38cb354aa7290" } Frame { msec: 1328 - hash: "afedb8f328ae31f2e5d68cd917d652ff" + hash: "892e9e8feeb15bbad5f38cb354aa7290" } Frame { msec: 1344 - hash: "afedb8f328ae31f2e5d68cd917d652ff" + hash: "892e9e8feeb15bbad5f38cb354aa7290" } Frame { msec: 1360 - hash: "afedb8f328ae31f2e5d68cd917d652ff" + hash: "06d6ad94b01af5b441fd64536f7740ff" } Frame { msec: 1376 - hash: "afedb8f328ae31f2e5d68cd917d652ff" + hash: "06d6ad94b01af5b441fd64536f7740ff" } Frame { msec: 1392 - hash: "afedb8f328ae31f2e5d68cd917d652ff" + hash: "06d6ad94b01af5b441fd64536f7740ff" } Frame { msec: 1408 - hash: "1a7c95dcd5dd375a01179626d3e1bb4b" + hash: "0552844f7915835d3a35a01137d4c310" } Frame { msec: 1424 - hash: "1a7c95dcd5dd375a01179626d3e1bb4b" + hash: "0552844f7915835d3a35a01137d4c310" } Frame { msec: 1440 - hash: "1a7c95dcd5dd375a01179626d3e1bb4b" + hash: "0552844f7915835d3a35a01137d4c310" } Frame { msec: 1456 - hash: "1a7c95dcd5dd375a01179626d3e1bb4b" + hash: "0552844f7915835d3a35a01137d4c310" } Frame { msec: 1472 - hash: "1a7c95dcd5dd375a01179626d3e1bb4b" + hash: "0552844f7915835d3a35a01137d4c310" } Frame { msec: 1488 - hash: "79e56686d52dad27374fe45933f7e045" + hash: "afdf5d4d9e49a82a395afad6b3fe4f86" } Frame { msec: 1504 - hash: "79e56686d52dad27374fe45933f7e045" + hash: "afdf5d4d9e49a82a395afad6b3fe4f86" } Frame { msec: 1520 - hash: "79e56686d52dad27374fe45933f7e045" + hash: "afdf5d4d9e49a82a395afad6b3fe4f86" } Frame { msec: 1536 - hash: "79e56686d52dad27374fe45933f7e045" + hash: "afdf5d4d9e49a82a395afad6b3fe4f86" } Frame { msec: 1552 - hash: "79e56686d52dad27374fe45933f7e045" + hash: "bb434e586d40ae0ebcb89cde55a4ca11" } Frame { msec: 1568 - hash: "79e56686d52dad27374fe45933f7e045" + hash: "bb434e586d40ae0ebcb89cde55a4ca11" } Frame { msec: 1584 - hash: "ad8f8e33731a8861016c3c9567419fff" + hash: "bb434e586d40ae0ebcb89cde55a4ca11" } Frame { msec: 1600 - hash: "ad8f8e33731a8861016c3c9567419fff" + hash: "bb434e586d40ae0ebcb89cde55a4ca11" } Frame { msec: 1616 - hash: "ad8f8e33731a8861016c3c9567419fff" + hash: "bb434e586d40ae0ebcb89cde55a4ca11" } Frame { msec: 1632 - hash: "609e9d64c3e376b37cf0833333d57a0b" + hash: "771561a07b3eb2396231b17343da7125" } Frame { msec: 1648 - hash: "609e9d64c3e376b37cf0833333d57a0b" + hash: "771561a07b3eb2396231b17343da7125" } Frame { msec: 1664 - hash: "609e9d64c3e376b37cf0833333d57a0b" + hash: "771561a07b3eb2396231b17343da7125" } Frame { msec: 1680 - hash: "609e9d64c3e376b37cf0833333d57a0b" + hash: "771561a07b3eb2396231b17343da7125" } Frame { msec: 1696 - hash: "f3a64e17c082529f753292a722a2b3e8" + hash: "771561a07b3eb2396231b17343da7125" } Frame { msec: 1712 - hash: "f3a64e17c082529f753292a722a2b3e8" + hash: "771561a07b3eb2396231b17343da7125" } Frame { msec: 1728 - hash: "f3a64e17c082529f753292a722a2b3e8" + hash: "d3d23db79c5f2a374b267bcda8919d1e" } Frame { msec: 1744 - hash: "76627f7257d24b08a9011c806d4c8458" + hash: "d3d23db79c5f2a374b267bcda8919d1e" } Key { type: 6 key: 16777249 - modifiers: 67108864 + modifiers: 0 text: "" autorep: false count: 1 } Frame { msec: 1760 - hash: "76627f7257d24b08a9011c806d4c8458" + hash: "36a40dbdbb39122d30c26643e5924548" } Frame { msec: 1776 - hash: "76627f7257d24b08a9011c806d4c8458" + hash: "36a40dbdbb39122d30c26643e5924548" } Frame { msec: 1792 - hash: "76627f7257d24b08a9011c806d4c8458" + hash: "36a40dbdbb39122d30c26643e5924548" } Frame { msec: 1808 - hash: "4275796ca36c974f6ba7ba2fc7c3d68f" + hash: "36a40dbdbb39122d30c26643e5924548" } Frame { msec: 1824 - hash: "4275796ca36c974f6ba7ba2fc7c3d68f" + hash: "36a40dbdbb39122d30c26643e5924548" } Frame { msec: 1840 - hash: "4275796ca36c974f6ba7ba2fc7c3d68f" + hash: "6a202f32d3d7a7c9edc97e55c2fe7aca" } Frame { msec: 1856 - hash: "4275796ca36c974f6ba7ba2fc7c3d68f" + hash: "6a202f32d3d7a7c9edc97e55c2fe7aca" } Frame { msec: 1872 - hash: "4275796ca36c974f6ba7ba2fc7c3d68f" + hash: "6a202f32d3d7a7c9edc97e55c2fe7aca" } Frame { msec: 1888 - hash: "9005e33c220aaadb6c1b756c496140b5" + hash: "765b11a4fff9a7295440568899107159" } Frame { msec: 1904 - hash: "9005e33c220aaadb6c1b756c496140b5" + hash: "765b11a4fff9a7295440568899107159" } Frame { msec: 1920 @@ -494,239 +494,239 @@ VisualTest { } Frame { msec: 1936 - hash: "9005e33c220aaadb6c1b756c496140b5" + hash: "765b11a4fff9a7295440568899107159" } Frame { msec: 1952 - hash: "9005e33c220aaadb6c1b756c496140b5" + hash: "765b11a4fff9a7295440568899107159" } Frame { msec: 1968 - hash: "1664ce25b0e427b89e64c00668797dc1" + hash: "e2726e028d0a17a918a28d248a087d71" } Frame { msec: 1984 - hash: "1664ce25b0e427b89e64c00668797dc1" + hash: "e2726e028d0a17a918a28d248a087d71" } Frame { msec: 2000 - hash: "1664ce25b0e427b89e64c00668797dc1" + hash: "e2726e028d0a17a918a28d248a087d71" } Frame { msec: 2016 - hash: "1664ce25b0e427b89e64c00668797dc1" + hash: "e2726e028d0a17a918a28d248a087d71" } Frame { msec: 2032 - hash: "1664ce25b0e427b89e64c00668797dc1" + hash: "94243dc2a8013e86250c993103b2d789" } Frame { msec: 2048 - hash: "4421ad90c93cca320b790c0432745a5e" + hash: "94243dc2a8013e86250c993103b2d789" } Frame { msec: 2064 - hash: "4421ad90c93cca320b790c0432745a5e" + hash: "94243dc2a8013e86250c993103b2d789" } Frame { msec: 2080 - hash: "4421ad90c93cca320b790c0432745a5e" + hash: "94243dc2a8013e86250c993103b2d789" } Frame { msec: 2096 - hash: "c21285318beec99e9afd1dde46a5497b" + hash: "94243dc2a8013e86250c993103b2d789" } Frame { msec: 2112 - hash: "c21285318beec99e9afd1dde46a5497b" + hash: "d8fdababa06e1cafa9047de16d5a07b5" } Frame { msec: 2128 - hash: "c21285318beec99e9afd1dde46a5497b" + hash: "d8fdababa06e1cafa9047de16d5a07b5" } Frame { msec: 2144 - hash: "ec4f44aa4f4b7de7e597cab376c1f82f" + hash: "d8fdababa06e1cafa9047de16d5a07b5" } Frame { msec: 2160 - hash: "ec4f44aa4f4b7de7e597cab376c1f82f" + hash: "d8fdababa06e1cafa9047de16d5a07b5" } Frame { msec: 2176 - hash: "ec4f44aa4f4b7de7e597cab376c1f82f" + hash: "d8fdababa06e1cafa9047de16d5a07b5" } Frame { msec: 2192 - hash: "ad984149e44b3be55e420b1be3c0b8c3" + hash: "f31d3f99faff3289b38ec91a43108707" } Frame { msec: 2208 - hash: "ad984149e44b3be55e420b1be3c0b8c3" + hash: "f31d3f99faff3289b38ec91a43108707" } Frame { msec: 2224 - hash: "ad984149e44b3be55e420b1be3c0b8c3" + hash: "f31d3f99faff3289b38ec91a43108707" } Frame { msec: 2240 - hash: "ad984149e44b3be55e420b1be3c0b8c3" + hash: "60468f768e70c91cd28dca9479ed7738" } Frame { msec: 2256 - hash: "ad984149e44b3be55e420b1be3c0b8c3" + hash: "60468f768e70c91cd28dca9479ed7738" } Frame { msec: 2272 - hash: "cd016ce04572119cf89263091ae55b2f" + hash: "fd5e8714cdd406f5626682c15a6efa38" } Frame { msec: 2288 - hash: "cd016ce04572119cf89263091ae55b2f" + hash: "fd5e8714cdd406f5626682c15a6efa38" } Frame { msec: 2304 - hash: "e621ae81e0da861323efe03d1a6f2ac4" + hash: "fd5e8714cdd406f5626682c15a6efa38" } Frame { msec: 2320 - hash: "e621ae81e0da861323efe03d1a6f2ac4" + hash: "20f37569f7f3b374753b991b28d98e74" } Frame { msec: 2336 - hash: "e621ae81e0da861323efe03d1a6f2ac4" + hash: "20f37569f7f3b374753b991b28d98e74" } Frame { msec: 2352 - hash: "e621ae81e0da861323efe03d1a6f2ac4" + hash: "20f37569f7f3b374753b991b28d98e74" } Frame { msec: 2368 - hash: "e621ae81e0da861323efe03d1a6f2ac4" + hash: "20f37569f7f3b374753b991b28d98e74" } Frame { msec: 2384 - hash: "b9f9502b8acbd59927b78104dc39b3ea" + hash: "20f37569f7f3b374753b991b28d98e74" } Frame { msec: 2400 - hash: "b9f9502b8acbd59927b78104dc39b3ea" + hash: "8ab72206d4ba87effd44844c67ab4d53" } Frame { msec: 2416 - hash: "b9f9502b8acbd59927b78104dc39b3ea" + hash: "8ab72206d4ba87effd44844c67ab4d53" } Frame { msec: 2432 - hash: "b9f9502b8acbd59927b78104dc39b3ea" + hash: "65fccdd3a8803ec1d70a12407366fb57" } Frame { msec: 2448 - hash: "b9f9502b8acbd59927b78104dc39b3ea" + hash: "65fccdd3a8803ec1d70a12407366fb57" } Frame { msec: 2464 - hash: "69bc7470ddd917ec73a075ba16715ccf" + hash: "65fccdd3a8803ec1d70a12407366fb57" } Frame { msec: 2480 - hash: "69bc7470ddd917ec73a075ba16715ccf" + hash: "65fccdd3a8803ec1d70a12407366fb57" } Frame { msec: 2496 - hash: "69bc7470ddd917ec73a075ba16715ccf" + hash: "65fccdd3a8803ec1d70a12407366fb57" } Frame { msec: 2512 - hash: "69bc7470ddd917ec73a075ba16715ccf" + hash: "ea98cc56d2f402814d8c1b952c8bd9a0" } Frame { msec: 2528 - hash: "69bc7470ddd917ec73a075ba16715ccf" + hash: "ea98cc56d2f402814d8c1b952c8bd9a0" } Frame { msec: 2544 - hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa" + hash: "ea98cc56d2f402814d8c1b952c8bd9a0" } Frame { msec: 2560 - hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa" + hash: "ea98cc56d2f402814d8c1b952c8bd9a0" } Frame { msec: 2576 - hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa" + hash: "6dd6532db6afba17d36930bfd71abb5d" } Frame { msec: 2592 - hash: "9d2d1ad3db3f80ffc6fcd321a4f5adfa" + hash: "6dd6532db6afba17d36930bfd71abb5d" } Frame { msec: 2608 - hash: "c82742c641c411df5d9ecb4d19b7a30d" + hash: "6dd6532db6afba17d36930bfd71abb5d" } Frame { msec: 2624 - hash: "c82742c641c411df5d9ecb4d19b7a30d" + hash: "6dd6532db6afba17d36930bfd71abb5d" } Frame { msec: 2640 - hash: "c82742c641c411df5d9ecb4d19b7a30d" + hash: "6dd6532db6afba17d36930bfd71abb5d" } Frame { msec: 2656 - hash: "ae50d41ef5289fc31b5cd18462905379" + hash: "70989ac02176a37beb2cf259cd2d9770" } Frame { msec: 2672 - hash: "ae50d41ef5289fc31b5cd18462905379" + hash: "70989ac02176a37beb2cf259cd2d9770" } Frame { msec: 2688 - hash: "ae50d41ef5289fc31b5cd18462905379" + hash: "70989ac02176a37beb2cf259cd2d9770" } Frame { msec: 2704 - hash: "ae50d41ef5289fc31b5cd18462905379" + hash: "70989ac02176a37beb2cf259cd2d9770" } Frame { msec: 2720 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "1c6d8786cb42afa2af611dec5ebdcda7" } Frame { msec: 2736 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "1c6d8786cb42afa2af611dec5ebdcda7" } Frame { msec: 2752 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "3e8215d2cb61404230284ddd0041a79c" } Frame { msec: 2768 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "3e8215d2cb61404230284ddd0041a79c" } Frame { msec: 2784 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "3e8215d2cb61404230284ddd0041a79c" } Frame { msec: 2800 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "3e8215d2cb61404230284ddd0041a79c" } Frame { msec: 2816 - hash: "38d393df298826121109b6bd2d454bc0" + hash: "3e8215d2cb61404230284ddd0041a79c" } Frame { msec: 2832 - hash: "50a47e20ff34a2935b1dde36c85f7f54" + hash: "a4ed37665222950eab7fcb53dbe22bcf" } Frame { msec: 2848 - hash: "50a47e20ff34a2935b1dde36c85f7f54" + hash: "a4ed37665222950eab7fcb53dbe22bcf" } Frame { msec: 2864 - hash: "4daa350f9385217b9eef714f40b4e6d0" + hash: "a4ed37665222950eab7fcb53dbe22bcf" } Frame { msec: 2880 @@ -734,239 +734,239 @@ VisualTest { } Frame { msec: 2896 - hash: "4daa350f9385217b9eef714f40b4e6d0" + hash: "a4ed37665222950eab7fcb53dbe22bcf" } Frame { msec: 2912 - hash: "0e36ea4104aa509455555796262ea30d" + hash: "a4ed37665222950eab7fcb53dbe22bcf" } Frame { msec: 2928 - hash: "0e36ea4104aa509455555796262ea30d" + hash: "a7f26f5fbcc97f408974e4bc23fd0b70" } Frame { msec: 2944 - hash: "0e36ea4104aa509455555796262ea30d" + hash: "a7f26f5fbcc97f408974e4bc23fd0b70" } Frame { msec: 2960 - hash: "0e36ea4104aa509455555796262ea30d" + hash: "913478b8d5d05967efd1c83e80e773e2" } Frame { msec: 2976 - hash: "0e36ea4104aa509455555796262ea30d" + hash: "913478b8d5d05967efd1c83e80e773e2" } Frame { msec: 2992 - hash: "4dd59519884c4aa19834430b2b0a3040" + hash: "913478b8d5d05967efd1c83e80e773e2" } Frame { msec: 3008 - hash: "4dd59519884c4aa19834430b2b0a3040" + hash: "130749caf262b3055e7ac229b6b89548" } Frame { msec: 3024 - hash: "4dd59519884c4aa19834430b2b0a3040" + hash: "130749caf262b3055e7ac229b6b89548" } Frame { msec: 3040 - hash: "4dd59519884c4aa19834430b2b0a3040" + hash: "130749caf262b3055e7ac229b6b89548" } Frame { msec: 3056 - hash: "4dd59519884c4aa19834430b2b0a3040" + hash: "130749caf262b3055e7ac229b6b89548" } Frame { msec: 3072 - hash: "5e2e943b2ab6f798660b32e132ec6bef" + hash: "130749caf262b3055e7ac229b6b89548" } Frame { msec: 3088 - hash: "5e2e943b2ab6f798660b32e132ec6bef" + hash: "d7260d913c58065a671ff6b931bb2fb6" } Frame { msec: 3104 - hash: "5e2e943b2ab6f798660b32e132ec6bef" + hash: "d7260d913c58065a671ff6b931bb2fb6" } Frame { msec: 3120 - hash: "a64b8d6bae4b6445d5de78b126e3af63" + hash: "d7260d913c58065a671ff6b931bb2fb6" } Frame { msec: 3136 - hash: "a64b8d6bae4b6445d5de78b126e3af63" + hash: "d7260d913c58065a671ff6b931bb2fb6" } Frame { msec: 3152 - hash: "8732d4c3b6ea276079794d2c892d14a9" + hash: "9059402dce5cb1813af8f7ebbd831bca" } Frame { msec: 3168 - hash: "8732d4c3b6ea276079794d2c892d14a9" + hash: "9059402dce5cb1813af8f7ebbd831bca" } Frame { msec: 3184 - hash: "8732d4c3b6ea276079794d2c892d14a9" + hash: "9059402dce5cb1813af8f7ebbd831bca" } Frame { msec: 3200 - hash: "931f767d8c733d2262b8c73003629fd1" + hash: "80387fc8aedc0c490c689c3a1711fe9f" } Frame { msec: 3216 - hash: "931f767d8c733d2262b8c73003629fd1" + hash: "80387fc8aedc0c490c689c3a1711fe9f" } Frame { msec: 3232 - hash: "931f767d8c733d2262b8c73003629fd1" + hash: "80387fc8aedc0c490c689c3a1711fe9f" } Frame { msec: 3248 - hash: "931f767d8c733d2262b8c73003629fd1" + hash: "f461bf58cbfd345a3f4e087cfcb0e9f0" } Frame { msec: 3264 - hash: "931f767d8c733d2262b8c73003629fd1" + hash: "f461bf58cbfd345a3f4e087cfcb0e9f0" } Frame { msec: 3280 - hash: "526f7d87bdce834a8d4396df4406d4c7" + hash: "d41a792b81cb891a91f2bff6dbee3bdd" } Frame { msec: 3296 - hash: "526f7d87bdce834a8d4396df4406d4c7" + hash: "d41a792b81cb891a91f2bff6dbee3bdd" } Frame { msec: 3312 - hash: "526f7d87bdce834a8d4396df4406d4c7" + hash: "d41a792b81cb891a91f2bff6dbee3bdd" } Frame { msec: 3328 - hash: "526f7d87bdce834a8d4396df4406d4c7" + hash: "d41a792b81cb891a91f2bff6dbee3bdd" } Frame { msec: 3344 - hash: "526f7d87bdce834a8d4396df4406d4c7" + hash: "d41a792b81cb891a91f2bff6dbee3bdd" } Frame { msec: 3360 - hash: "0c9bb37ebb01a6127b60d26792cc3524" + hash: "664ac430dd416e6d1ed7e001458202cf" } Frame { msec: 3376 - hash: "0c9bb37ebb01a6127b60d26792cc3524" + hash: "664ac430dd416e6d1ed7e001458202cf" } Frame { msec: 3392 - hash: "0c9bb37ebb01a6127b60d26792cc3524" + hash: "664ac430dd416e6d1ed7e001458202cf" } Frame { msec: 3408 - hash: "04b580975c168ef07b11496a18b55582" + hash: "664ac430dd416e6d1ed7e001458202cf" } Frame { msec: 3424 - hash: "04b580975c168ef07b11496a18b55582" + hash: "664ac430dd416e6d1ed7e001458202cf" } Frame { msec: 3440 - hash: "c4abe8e74b0a0a61ee671b4d7047b244" + hash: "c7a9e47b613745858a76a57e1782b566" } Frame { msec: 3456 - hash: "c4abe8e74b0a0a61ee671b4d7047b244" + hash: "c7a9e47b613745858a76a57e1782b566" } Frame { msec: 3472 - hash: "c4abe8e74b0a0a61ee671b4d7047b244" + hash: "b90d46cbd9d7d1d82cb9abfbe27fc549" } Frame { msec: 3488 - hash: "c4abe8e74b0a0a61ee671b4d7047b244" + hash: "b90d46cbd9d7d1d82cb9abfbe27fc549" } Frame { msec: 3504 - hash: "c4abe8e74b0a0a61ee671b4d7047b244" + hash: "b90d46cbd9d7d1d82cb9abfbe27fc549" } Frame { msec: 3520 - hash: "c4abe8e74b0a0a61ee671b4d7047b244" + hash: "59c03ceae9b13576bd0e285234dfe264" } Frame { msec: 3536 - hash: "179c36c797dfd91fdc6bd373f5331cbb" + hash: "59c03ceae9b13576bd0e285234dfe264" } Frame { msec: 3552 - hash: "179c36c797dfd91fdc6bd373f5331cbb" + hash: "59c03ceae9b13576bd0e285234dfe264" } Frame { msec: 3568 - hash: "179c36c797dfd91fdc6bd373f5331cbb" + hash: "59c03ceae9b13576bd0e285234dfe264" } Frame { msec: 3584 - hash: "179c36c797dfd91fdc6bd373f5331cbb" + hash: "59c03ceae9b13576bd0e285234dfe264" } Frame { msec: 3600 - hash: "179c36c797dfd91fdc6bd373f5331cbb" + hash: "b883d12eea2ec596cb6ee81f2d1db35f" } Frame { msec: 3616 - hash: "49b9d5168c3fa5e09953251ffb509743" + hash: "b883d12eea2ec596cb6ee81f2d1db35f" } Frame { msec: 3632 - hash: "49b9d5168c3fa5e09953251ffb509743" + hash: "b883d12eea2ec596cb6ee81f2d1db35f" } Frame { msec: 3648 - hash: "49b9d5168c3fa5e09953251ffb509743" + hash: "b883d12eea2ec596cb6ee81f2d1db35f" } Frame { msec: 3664 - hash: "49b9d5168c3fa5e09953251ffb509743" + hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0" } Frame { msec: 3680 - hash: "49b9d5168c3fa5e09953251ffb509743" + hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0" } Frame { msec: 3696 - hash: "da74be0adb46300cac7ba9bfe3660c33" + hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0" } Frame { msec: 3712 - hash: "da74be0adb46300cac7ba9bfe3660c33" + hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0" } Frame { msec: 3728 - hash: "9276749ab90c7da1eb62c6277613f75a" + hash: "9bd66e03c36c8cc279c9cfb1ea9e96a0" } Frame { msec: 3744 - hash: "9276749ab90c7da1eb62c6277613f75a" + hash: "ee357c3850d0f328db859e7b790bed83" } Frame { msec: 3760 - hash: "b85b7f367d4da5bd01fe87a292a356fd" + hash: "ee357c3850d0f328db859e7b790bed83" } Frame { msec: 3776 - hash: "b85b7f367d4da5bd01fe87a292a356fd" + hash: "f706095272153c1e9fc4a4825ba54d91" } Frame { msec: 3792 - hash: "b85b7f367d4da5bd01fe87a292a356fd" + hash: "f706095272153c1e9fc4a4825ba54d91" } Frame { msec: 3808 - hash: "b85b7f367d4da5bd01fe87a292a356fd" + hash: "34f4d03164469f99bb7bcb365041cf8e" } Frame { msec: 3824 - hash: "b85b7f367d4da5bd01fe87a292a356fd" + hash: "34f4d03164469f99bb7bcb365041cf8e" } Frame { msec: 3840 @@ -974,18 +974,18 @@ VisualTest { } Frame { msec: 3856 - hash: "e871d5f9d6437154ef85a60fe5a6a08e" + hash: "34f4d03164469f99bb7bcb365041cf8e" } Frame { msec: 3872 - hash: "e871d5f9d6437154ef85a60fe5a6a08e" + hash: "34f4d03164469f99bb7bcb365041cf8e" } Frame { msec: 3888 - hash: "f66f5d470e913f4bec6c8982702b8a60" + hash: "97cb5f52e1a5e82a15542b7e5f772fba" } Frame { msec: 3904 - hash: "f66f5d470e913f4bec6c8982702b8a60" + hash: "97cb5f52e1a5e82a15542b7e5f772fba" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png Binary files differindex 944208b..8caaf5f 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml index e76ad11..30df3fa 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-MAC/multilength.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "fa4edc25cc530be81c5c18c089c76643" + hash: "2e258ad7cb0a2cd7c6c47a0b0a9563c1" } Frame { msec: 32 - hash: "d543f734101d89c6d4e4a5992bd34cb3" + hash: "d818e0f4f1011a2a8f1d0d803fa18bc0" } Frame { msec: 48 - hash: "fc96f61ab3f8235d96c815f8876728f5" + hash: "44b37be97bbd1f0e26d81f76d9643e51" } Frame { msec: 64 - hash: "0bdeb73a4cfbe216ca795756baa353c8" + hash: "3079a5cf6b8277ae3e1b29ae09d04adc" } Frame { msec: 80 - hash: "4451049db7f7d0b62325af6d27073f16" + hash: "ba899e6f18abb7105f915cef4e60f1e1" } Frame { msec: 96 - hash: "ef51f1424db831f962960e468b547cc5" + hash: "6d2d2b3dc8afa60e32a39449ba90f78d" } Frame { msec: 112 - hash: "c79ffb52d5aa11e2ee99e9db57c58c3e" + hash: "965af350a8fc20c7bcffb370802bc9d9" } Frame { msec: 128 - hash: "3827b0ca877b214ceffdc7444f9eae14" + hash: "8e088db1ff0eb9f5c28268dee929928c" } Frame { msec: 144 - hash: "8e375f05606f04f81c2ff0551ce7a290" + hash: "a0ba6c6bd1e491778294346eeabd8138" } Frame { msec: 160 - hash: "8d48743f9d3c02cdb342c57b080ab52a" + hash: "068a018a5c017cb76ebf3721e0acdb35" } Frame { msec: 176 - hash: "a8d1cae0e817ca059a73594f35eeccaf" + hash: "efa65cae0a4d027c2ec508deecef8aa5" } Frame { msec: 192 - hash: "71d024907815100b5ea74e072e167384" + hash: "9c224e97aa56c6b203a48fb689d72c9a" } Frame { msec: 208 - hash: "8f294501a7d0dff60233c922161f0b8d" + hash: "4f78af1e82a2dd46bab2d237d4f574e5" } Frame { msec: 224 - hash: "303deae49dd99baba31af8915dd43d4d" + hash: "7d022c13e3ef07ca0b6618ae8865dbf1" } Frame { msec: 240 - hash: "41f34af1ca4417e546d40057727a24b8" + hash: "1dc2ecf6cb92cd7d9e467de0049a8598" } Frame { msec: 256 - hash: "baf5102132a01cb44925f7fc1532f8fb" + hash: "262174926ac657c3cd788e2383b5842b" } Frame { msec: 272 - hash: "559c5e92b2cc8f20c2289bdabc7d2a3c" + hash: "984c40aaa927f9e9e73ad228f057d3d9" } Frame { msec: 288 - hash: "39a50d44ae47e6c358d6ebaa2234cbfb" + hash: "0c74101beaeb0a59c1e6b1bf751ca71d" } Frame { msec: 304 - hash: "4bdfe9e04c2ee21a584dc7612603fe62" + hash: "1c2dd6a6675014255e83c2ae734d717b" } Frame { msec: 320 - hash: "e3ff2c98c9309964ccc612c4499817ff" + hash: "f6ac3e9e82a9a710f500f8053b6030ac" } Frame { msec: 336 - hash: "f3509a8a9fe255e30e1b23ca36803169" + hash: "9676fdc060e5784e96534a962992c024" } Frame { msec: 352 - hash: "644629a42f8a2c8dc1f84e274e25df52" + hash: "c46634183e4bde82419bf757bd674a72" } Frame { msec: 368 - hash: "e169e2e67b0ebffc2181463a1e155e5c" + hash: "d04d082f4a1602a308da7f373cbb4094" } Frame { msec: 384 - hash: "74ccb97fe629c48211543e885930f18e" + hash: "a4178c9ffbb74f3f221fc63bee26ca35" } Frame { msec: 400 - hash: "14d97918485475971a832002a333722d" + hash: "0667b13789a501995b2846f7d93fb973" } Frame { msec: 416 - hash: "4e768d02555701df2109d07259228b05" + hash: "fda46bf0beecbb4326b2fc6f6926f0a7" } Frame { msec: 432 - hash: "ceeeeffb00e1f74ace1a11832d183c81" + hash: "85cbdea027d76dee1dad376679a40a22" } Frame { msec: 448 - hash: "3e6660aff9dfd72e5bd7e67d547af8b5" + hash: "0fd56200749ea5882e1bd714e9803d44" } Frame { msec: 464 - hash: "991a782f939dbfe96b316254177f34ad" + hash: "10bf5c477f64f442990716b7eec8fd70" } Frame { msec: 480 - hash: "ce4adfec222428d3fd7dd6069c69674c" + hash: "7cbd8ba3f09c3d00051cd33006381afb" } Frame { msec: 496 - hash: "27d658710bdeb0395052291bb736fdac" + hash: "dca10161836025808cddce9fd93f2412" } Frame { msec: 512 - hash: "a448c7c9fc2b4cf62f57ced461e39a05" + hash: "b949ec6303ccaafc203066c7f9b33ef2" } Frame { msec: 528 - hash: "0e1fd2a517db3a3fafb2840bbe550592" + hash: "853c521bad75c08c0dfe3a00bed01136" } Frame { msec: 544 - hash: "2ff7fe0c183fddc88d0daaabb866d78b" + hash: "dd76c440dc8cfcb7305409483d21d65d" } Frame { msec: 560 - hash: "73c952ed17daaf19755728185d999f96" + hash: "c9b70db4b94e4b0cc855102f43b8e731" } Frame { msec: 576 - hash: "85e9928b19d66b8ab1ee6b10d8b2b401" + hash: "d196057b8aa1e11ec9cf11032b57ca03" } Frame { msec: 592 - hash: "0c6fa7c70f98d53f2f0425e79083dc2c" + hash: "0fae715746a8a340a8f3c4428cf96783" } Frame { msec: 608 - hash: "589813b70ea86dd5ebe47ccf2121b5a8" + hash: "dd2e89d00ce85b167fbc822fedbfb449" } Frame { msec: 624 - hash: "7b94db2fd4f35fda4183a4351581a931" + hash: "a5228adf745f580364eafcbbdd994178" } Frame { msec: 640 - hash: "5769822d37ed1e88aacbbaaddbd7520a" + hash: "f750f588ee00805bc3757940f95de9ae" } Frame { msec: 656 - hash: "36ab6549d745c1d0e7a7b47b9d1f6887" + hash: "55a79fefc2bf6d42b442e68150e3a9bc" } Frame { msec: 672 - hash: "d130cecb02cdacc0cdbcce80e492d21b" + hash: "7b932e7585e66cc7cd31f858ce78a6e1" } Frame { msec: 688 - hash: "d1395dbf450e90c4f18c872cd50fca8f" + hash: "10f204c59a5bff0c49dfc7691c35cef8" } Frame { msec: 704 - hash: "7415bda155a9287ba22eac9c0548f10e" + hash: "cf901c80729eb0b83b46777e727d43e2" } Frame { msec: 720 - hash: "b65b886a632b042c00317a4013071f6c" + hash: "f6bf6e11ef6a71d7e746fae1d0a44531" } Frame { msec: 736 - hash: "cf4289cd85cb18bbf1a677008d8f1f0a" + hash: "4a8795196ece8c0ef18319008dbc0f2f" } Frame { msec: 752 - hash: "97a6e76519c522854ec88cc9e40165da" + hash: "44d32f0b5377ad3b08928413f20e95e1" } Frame { msec: 768 - hash: "bb80a571507cdc994f79ef05b0ad3b68" + hash: "9e0dd160a465573cbac831a14e36ba6d" } Frame { msec: 784 - hash: "823d647182b73e0f57ff7aca373160f1" + hash: "fb2e2522cee569632d9682aa04e7ca08" } Frame { msec: 800 - hash: "29b649d6cc3510a904561050bea9aa5b" + hash: "71b0e8d7671cee10f4f71a80abcde7ec" } Frame { msec: 816 - hash: "195089eb803c1eef039bac097e446ae6" + hash: "4affee92d320d6eca9995ddd8989627f" } Frame { msec: 832 - hash: "eb5d4b8a47cec6940c5c5019e1ca2fae" + hash: "b3e5e26a34cd491d3cd23f4e611266e2" } Frame { msec: 848 - hash: "e8aebb115dba21f631ad6bce87615fd3" + hash: "aa185efe8d0c4c61d4df55266830cfd8" } Frame { msec: 864 - hash: "15c9982c4c71542788e563db6e069fd1" + hash: "19c01ead1135f84b4b3a32583815fd10" } Frame { msec: 880 - hash: "8124924f33282195f0a04cb178a332b1" + hash: "a231a722225c26ff764f16570d1e6beb" } Frame { msec: 896 - hash: "0134d4df0b3b524107baa4068c64af7f" + hash: "466fce12d10bd4b714d4ead14d1c5839" } Frame { msec: 912 - hash: "bd3015b94540bafebfc9a7190b0e3d6c" + hash: "158650554c8467ed7d93c3c11177e041" } Frame { msec: 928 - hash: "3edcdf689225edcba379775c86390609" + hash: "ac16910bc816ca6c76a78160dda8380d" } Frame { msec: 944 - hash: "407d4d439efec4cb07c80a5bc6638b51" + hash: "23ac6eeb0c9bd48dbc844b1263a18cbb" } Frame { msec: 960 @@ -246,58 +246,58 @@ VisualTest { } Frame { msec: 976 - hash: "7b58d2d0726bb994d9e651411d76cbe4" + hash: "3da0b9d963113cfb58152bac1c757065" } Frame { msec: 992 - hash: "15801c5e1e470c8c45c24debfb9b478b" + hash: "e1a33345ee1372069d9282406f1e5605" } Frame { msec: 1008 - hash: "e257158a1da8908df7522bede4e9c4d9" + hash: "da872c570bccf17e88ac7db1d6d076ae" } Frame { msec: 1024 - hash: "3cb21bef1761c2f70b880b54ca9234fc" + hash: "6feea54c6a7f9895001efeff177f9be9" } Frame { msec: 1040 - hash: "b5effa369f0ab095f4345e2b9f6caa5f" + hash: "09049b33ca46a2fc2d06855e29ae66bf" } Frame { msec: 1056 - hash: "aaafb43e6290a9e7b351dd7c13b8aaaf" + hash: "cd96d789f57ac1d425942416337174f1" } Frame { msec: 1072 - hash: "8a4b622539868188f40f8c7fe75c6ddf" + hash: "0a763dd626e27ad14963aecfb8d7673c" } Frame { msec: 1088 - hash: "365c2f7c0d1c718cf326864c3ba75d2e" + hash: "3d81f68bb7aac95b66b0cd0defbb3657" } Frame { msec: 1104 - hash: "bac17384d4f375652bbc574459554835" + hash: "469b862006f99dfefcca803bc49287e3" } Frame { msec: 1120 - hash: "6bf6917ee323a05824bd6d071459d0b2" + hash: "c3f698102bd46231430ab9e8029b8192" } Frame { msec: 1136 - hash: "7aee8af3ef6b6592011b29281fb0e545" + hash: "421a9b4848a59281aea73c08a7219a33" } Frame { msec: 1152 - hash: "5351b508cbd2e0352f230d211b864c4f" + hash: "0066eaa302678a4be35dca0c3ed33b1c" } Frame { msec: 1168 - hash: "5a051f26ba6287707dbff8422d1eb9f3" + hash: "4cceb05bfeb231189b66f1fbdfaeccd3" } Frame { msec: 1184 - hash: "67611596f75fe97b13a9cf0dc0313727" + hash: "ccf229cdd6fde7ef663791d27a008bee" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml new file mode 100644 index 0000000..690cb15 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/TestText.qml @@ -0,0 +1,13 @@ +import QtQuick 1.0 + +Text { + id: testText + + property color bcolor: "blue" + + text: "The quick brown fox\njumps over\nthe lazy dog." + font.family: "Helvetica" + font.pointSize: 16 + + Rectangle { id: borderr; color: "transparent"; border.color: bcolor; anchors.fill: parent; opacity: 0.2 } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png Binary files differindex 22863cf..cd436b5 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png Binary files differnew file mode 100644 index 0000000..e47b479 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml index 1a8af0e..f6cddc4 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.qml @@ -6,126 +6,6 @@ VisualTest { } Frame { msec: 16 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 32 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 48 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 64 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 80 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 96 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 112 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 128 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 144 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 160 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 176 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 192 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 208 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 224 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 240 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 256 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 272 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 288 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 304 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 320 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 336 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 352 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 368 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 384 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 400 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 416 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 432 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Key { - type: 6 - key: 16777249 - modifiers: 67108864 - text: "" - autorep: false - count: 1 - } - Frame { - msec: 448 - hash: "c68e50ef84647962481121e2eb1ba4d4" - } - Frame { - msec: 464 - hash: "c68e50ef84647962481121e2eb1ba4d4" + image: "plaintext2.0.png" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png Binary files differnew file mode 100644 index 0000000..0d3c672 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml new file mode 100644 index 0000000..13f413a --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.qml @@ -0,0 +1,11 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + image: "plaintext3.0.png" + } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png Binary files differindex aac7c8d..ba833a2 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png Binary files differnew file mode 100644 index 0000000..0d3c672 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml new file mode 100644 index 0000000..13f413a --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext3.qml @@ -0,0 +1,11 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + image: "plaintext3.0.png" + } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml new file mode 100644 index 0000000..087dfbe --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext3.qml @@ -0,0 +1,62 @@ +import QtQuick 1.0 + +Rectangle { + id: main + width: 800; height: 600 + + + Grid { + x: 4; y: 4 + spacing: 8 + columns: 4 + + Column { + spacing: 4 + TestText { } + TestText { horizontalAlignment: Text.AlignHCenter } + TestText { horizontalAlignment: Text.AlignRight } + } + + Column { + spacing: 4 + TestText { wrapMode: Text.Wrap } + TestText { horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap } + TestText { horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap } + } + + Column { + spacing: 4 + TestText { wrapMode: Text.Wrap; elide: Text.ElideRight } + TestText { horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap; elide: Text.ElideRight } + TestText { horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap; elide: Text.ElideRight } + } + + Column { + spacing: 4 + TestText { width: 230; wrapMode: Text.Wrap; elide: Text.ElideRight } + TestText { width: 230; horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap; elide: Text.ElideRight } + TestText { width: 230; horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap; elide: Text.ElideRight } + } + + Column { + spacing: 4 + TestText { width: 120; wrapMode: Text.Wrap; elide: Text.ElideRight } + TestText { width: 120; horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap; elide: Text.ElideRight } + TestText { width: 120; horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap; elide: Text.ElideRight } + } + + Column { + spacing: 4 + TestText { width: 120; wrapMode: Text.Wrap } + TestText { width: 120; horizontalAlignment: Text.AlignHCenter; wrapMode: Text.Wrap } + TestText { width: 120; horizontalAlignment: Text.AlignRight; wrapMode: Text.Wrap } + } + + Column { + spacing: 4 + TestText { width: 120 } + TestText { width: 120; horizontalAlignment: Text.AlignHCenter } + TestText { width: 120; horizontalAlignment: Text.AlignRight } + } + } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png Binary files differindex 3f2c403..f41c165 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png Binary files differindex e94c97b..539e4df 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png Binary files differindex 847f8a5..47ceaac 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png Binary files differindex 9002e80..e24a453 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png Binary files differindex 0a399c8..ecf8335 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml index f714adc..ff5db41 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/cursorDelegate.qml @@ -6,87 +6,87 @@ VisualTest { } Frame { msec: 16 - hash: "fd83046af94eac26d394a5da986e734c" + hash: "c1bb09480464b7813bc10b0093d14745" } Frame { msec: 32 - hash: "c9bf546976fc17de9ea9e877f4978f02" + hash: "9d0e449506ce93052216b7a952af3dea" } Frame { msec: 48 - hash: "c711fd5d0c3900494493f8309b79ad0c" + hash: "52641f9d6dfba8bf2b94aa37ade140d1" } Frame { msec: 64 - hash: "b297d098f02fbbeac830b20b0a5194c5" + hash: "7610775f69a461d5487e8bc3db6b6e1f" } Frame { msec: 80 - hash: "b5e956f236ba52cb673af22417d1aabc" + hash: "afe0c3fdcb498f1f6b877c5d808b2555" } Frame { msec: 96 - hash: "e8cd9511f073ff40a6645ad6aa2b5bee" + hash: "97dabf3984492d2f868b36c3e7bfce50" } Frame { msec: 112 - hash: "315734f8f38efbc810ca2e65bd752ddd" + hash: "869624c2ae63b0a447401a955a6fefb1" } Frame { msec: 128 - hash: "fa7d20c99cb8c20494b558ce8ef860a2" + hash: "7031966f014d4acd5b00c46c89f61403" } Frame { msec: 144 - hash: "56cc00965e12254e0133fe1d914fffb2" + hash: "bd5395e7e0aa0d50cb30504f9961c954" } Frame { msec: 160 - hash: "690aa50862a887edcc9392d1c3ca0424" + hash: "a7142c3c1eb9c934e0b258c163fcdfec" } Frame { msec: 176 - hash: "c3df3735586ed103d137d4902d7a1cc3" + hash: "373c57edb812db59f40710305d80e9e9" } Frame { msec: 192 - hash: "0a2c07dc17922651d2abd6400fff6e43" + hash: "78b16507899c3c8de04b55389ea0ad49" } Frame { msec: 208 - hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6" + hash: "b0fd95dc2ac09a1cbd67ad0f86682666" } Frame { msec: 224 - hash: "7937850b86f3611ee1d75da9deb7420d" + hash: "5f073a4a89413b6a6c5d6ff52717bb2f" } Frame { msec: 240 - hash: "ecd42368bf2a9058185b9b25b659f4c6" + hash: "82e61a4d3f58ee5104893e254a77f13e" } Frame { msec: 256 - hash: "e545c6ba42edd1e6a055b48f162315ab" + hash: "a8fe05178e6339454d57575692fa3df3" } Frame { msec: 272 - hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7" + hash: "192f80add5f612b07dcb8d69f2161648" } Frame { msec: 288 - hash: "49de66674e8f38f925f3505c64201076" + hash: "cfd85885f59ea80b0b0152446a829fec" } Frame { msec: 304 - hash: "b33880917cae07d038620065ec2c1d1c" + hash: "a7295dcc92f80a5f343bf05076a03748" } Frame { msec: 320 - hash: "97c8af8dc7e5372a3a0f5bed0050127e" + hash: "2b0b30cfb1c1e4ed8a51d36fb7ccdf57" } Frame { msec: 336 - hash: "b0236b8c44398cb9f97324f6ca9ce5c4" + hash: "419c538908d0226ff4485f1094eaa08e" } Key { type: 6 @@ -98,27 +98,27 @@ VisualTest { } Frame { msec: 352 - hash: "2695b45a1ea89518d236ef3b8dccd89e" + hash: "8afe64448d42419f97ca207487b3b0f8" } Frame { msec: 368 - hash: "61370b1d04626facfd243176cb4bb79b" + hash: "86091218d2d066d8f95a460426266369" } Frame { msec: 384 - hash: "53c53e501469ca0ef0f0325a13aa4aa4" + hash: "fc45978cac92b6cdeeecc2dd4c29aa53" } Frame { msec: 400 - hash: "c56717a79ccffe756c5423bc5e44a53f" + hash: "03a90ae5cbe68cc210e303c78a14e065" } Frame { msec: 416 - hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b" + hash: "15603a997aa02afb688aa74cd930f3b4" } Frame { msec: 432 - hash: "4ccb9af28572e13f961f2057eb98482d" + hash: "90bf6b2bf89e1440f0c4d1044c1bd22c" } Key { type: 6 @@ -130,19 +130,19 @@ VisualTest { } Frame { msec: 448 - hash: "0b8ce455fd40c3cd74fb05d4b603cceb" + hash: "4dbdc16538cbbf1a87c6a54e09e02b16" } Frame { msec: 464 - hash: "f5c3754201dbb6f4ca4f4c1611036c5a" + hash: "2011ee59d2ec4bb0ae0d63727f091648" } Frame { msec: 480 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 496 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Key { type: 6 @@ -154,35 +154,35 @@ VisualTest { } Frame { msec: 512 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 528 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 544 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 560 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 576 - hash: "9e887b7206f31bbb95573ea4ff157579" + hash: "b4205f141a7a6b646cf641ba922d588b" } Frame { msec: 592 - hash: "0d66c3a6c2df2a2ffe95901e55a5f945" + hash: "94c3adf5da700bb63ed6eaf0adf8d037" } Frame { msec: 608 - hash: "af497d287a3cc1637da43f3cad97a479" + hash: "62c4757a2e26341655e27417f85ba6d8" } Frame { msec: 624 - hash: "e7c4f22fcc84e1fdf09191b3ae8529fa" + hash: "9de2ce48334b088c0a0960a581f43a36" } Key { type: 7 @@ -194,15 +194,15 @@ VisualTest { } Frame { msec: 640 - hash: "ec6b2062c0dc274febc63aa3a2313299" + hash: "9ca827d4812521d1590ca6e7117bd788" } Frame { msec: 656 - hash: "de8e8c97aef11ee03bec315fc82a46f8" + hash: "66f65cd7215ea89e60d8f60337fffe97" } Frame { msec: 672 - hash: "2f9e1a13c276282fd70b3242ec136b22" + hash: "05caae5e0d092c4d0595286aa4baa6a0" } Key { type: 6 @@ -214,31 +214,31 @@ VisualTest { } Frame { msec: 688 - hash: "60e390b7bb10dc756c83d5d52c7832f7" + hash: "2282153f3ae493aa6ad5377b12d88043" } Frame { msec: 704 - hash: "76bf44fbfcac0c8a6615ef4ba67ee91d" + hash: "aee2503a5d4ec61795b0486da5c53867" } Frame { msec: 720 - hash: "614e3712c8b91bcbadaedca209fc80dc" + hash: "f564e1ae90bc6b1ea4bc84f1729eb487" } Frame { msec: 736 - hash: "eb2204890d51b1112ea79f37768bb74e" + hash: "f5c70adef5725a0574b63dd5ab7d7b12" } Frame { msec: 752 - hash: "d5b0d7d19ae4d9df059002e619726266" + hash: "74ed3230417c69b0dc82ce9cfe4b6cd0" } Frame { msec: 768 - hash: "9bd5a7fde4e26a5913c41c61175a2fba" + hash: "374270279bcc00167d2b63bf9a658785" } Frame { msec: 784 - hash: "533e6355f554cfc324f90c70484632ab" + hash: "68445a2b5470e44baf7af95efc20ba33" } Key { type: 7 @@ -250,43 +250,43 @@ VisualTest { } Frame { msec: 800 - hash: "bf05da75483bdc6c4945c1c3a4f8b72a" + hash: "5add6c9527edf6bbdb3a79b8a524db70" } Frame { msec: 816 - hash: "9b7468ba9c2d9e354d15f60ca7ecf6b6" + hash: "01a96c8407fa2c0f9e7a822249ac9adc" } Frame { msec: 832 - hash: "5d57dbc8d8996c2275da30a6f22ea37f" + hash: "6b9af295d8f2fb5ba8d9c234596d0a88" } Frame { msec: 848 - hash: "3efa002ab3b856b0b8d4849b8bb6e567" + hash: "3837442e90c2a1534e21d21bfc3b46e1" } Frame { msec: 864 - hash: "84471ddf06c2c90a17bbef9d634ffabc" + hash: "afd7d2494dae8e7ef40a165ccc627313" } Frame { msec: 880 - hash: "cf8460f68815510416dc1cd86dd80c19" + hash: "6e7058d540b26d3c5f15804f2f93b835" } Frame { msec: 896 - hash: "7e1e02e0795e695a423ee3518c9e8e8f" + hash: "ffa489a15db741d8b835d998336bc1b3" } Frame { msec: 912 - hash: "ca5ea92767f31f7fb7e04894edadb73b" + hash: "5a0308d1d2a6a36e16ddb312294fcbf8" } Frame { msec: 928 - hash: "616e57b513b4e950803c49584de106bd" + hash: "bd56ed24908c7e8ec4e5ebc75a19ca86" } Frame { msec: 944 - hash: "718badb44982d10fe92b646aa5dc3d96" + hash: "7bd56b12087226100da27776f8943427" } Frame { msec: 960 @@ -294,19 +294,19 @@ VisualTest { } Frame { msec: 976 - hash: "4acc383cecec9d65dafa3b75b2711577" + hash: "f48a56350bba266c2f19deb46d39e174" } Frame { msec: 992 - hash: "9e26dd446fe8ed2b8a57888bc7f2f643" + hash: "9587bb118f2eb2bf8bb3cfc40ed18310" } Frame { msec: 1008 - hash: "369f454d8f387320423f2b2e568d6ad6" + hash: "0f9e9622427ebaf85369b3013ae9aaf0" } Frame { msec: 1024 - hash: "369f454d8f387320423f2b2e568d6ad6" + hash: "0f9e9622427ebaf85369b3013ae9aaf0" } Key { type: 7 @@ -318,39 +318,39 @@ VisualTest { } Frame { msec: 1040 - hash: "9e26dd446fe8ed2b8a57888bc7f2f643" + hash: "9587bb118f2eb2bf8bb3cfc40ed18310" } Frame { msec: 1056 - hash: "4acc383cecec9d65dafa3b75b2711577" + hash: "f48a56350bba266c2f19deb46d39e174" } Frame { msec: 1072 - hash: "2909eabaad28f76c37c780d0e0d9e357" + hash: "8234f16d07e76aeedb6ca14d622453cb" } Frame { msec: 1088 - hash: "718badb44982d10fe92b646aa5dc3d96" + hash: "7bd56b12087226100da27776f8943427" } Frame { msec: 1104 - hash: "616e57b513b4e950803c49584de106bd" + hash: "bd56ed24908c7e8ec4e5ebc75a19ca86" } Frame { msec: 1120 - hash: "ca5ea92767f31f7fb7e04894edadb73b" + hash: "5a0308d1d2a6a36e16ddb312294fcbf8" } Frame { msec: 1136 - hash: "7e1e02e0795e695a423ee3518c9e8e8f" + hash: "ffa489a15db741d8b835d998336bc1b3" } Frame { msec: 1152 - hash: "cf8460f68815510416dc1cd86dd80c19" + hash: "6e7058d540b26d3c5f15804f2f93b835" } Frame { msec: 1168 - hash: "84471ddf06c2c90a17bbef9d634ffabc" + hash: "afd7d2494dae8e7ef40a165ccc627313" } Key { type: 6 @@ -362,31 +362,31 @@ VisualTest { } Frame { msec: 1184 - hash: "0e4120f723b1b1d879065f0324ba18fa" + hash: "1d5c9458d568df773dbff4e333e14de0" } Frame { msec: 1200 - hash: "2a8c575dbe68797c8a909df9f1166ff8" + hash: "8eef242d89b7e2eff7678030f9fd808e" } Frame { msec: 1216 - hash: "e26abb9311a2b25ed32efb0da41a4d53" + hash: "97dc6ebbf64a19f5026c02ea4c79d63b" } Frame { msec: 1232 - hash: "d35ae7b04e8ddf1962a20f8593c9c18c" + hash: "52d2135428c3c2bf85f0fa7c2ba01a25" } Frame { msec: 1248 - hash: "afbbcee5ea4c854aebb7ba56856cf9c8" + hash: "c713bd1d1ab2df81292020e6e822546c" } Frame { msec: 1264 - hash: "2d97ae4f3657617d4f4df55090c2d0e1" + hash: "0c61ff34510168e324c53786720dd953" } Frame { msec: 1280 - hash: "dc024030252b263dc7dd3c05580d7ec6" + hash: "ba1488f2d9d4482cdf41c40af7642030" } Key { type: 7 @@ -398,95 +398,95 @@ VisualTest { } Frame { msec: 1296 - hash: "c9072651fd565ed8c6d69a258e464fca" + hash: "91d2da369579bb72641d4e7e7cd696f5" } Frame { msec: 1312 - hash: "bb6a90fd1cb94ed4b590c9ae65d31f86" + hash: "1cf1d30d6def868a60f434fe84c23c47" } Frame { msec: 1328 - hash: "d3e5054c8b0a25adb9bd0fe78bd72153" + hash: "ba5b3005af3c44caaf7272cbb56e60da" } Frame { msec: 1344 - hash: "158e31266eae1718958d37d2096b32af" + hash: "116ab7576b5e45e6009920854ff87f39" } Frame { msec: 1360 - hash: "6986bbfaedae3838de7a92f911d1e4d1" + hash: "294c76d6f63c230af666b0b86e0c9844" } Frame { msec: 1376 - hash: "8ab83b3b3038150036d6d6135d6e2d8d" + hash: "c721a5b17b1eb4a063fa3b727d13ba62" } Frame { msec: 1392 - hash: "6749a62f9d9eadc33e2d109c140bfdde" + hash: "a98bd750b67a0ef8831c9c66a0b06a28" } Frame { msec: 1408 - hash: "7519758a28f49b3a669f6676a1b47253" + hash: "7739509b0f5e62207ba62262d8822388" } Frame { msec: 1424 - hash: "a8470fa7ddf69b4f86c5933f85256684" + hash: "62d70a7e3ce290c52d37090bf899377c" } Frame { msec: 1440 - hash: "1f2f34e0dfeb38bd568915718627abf5" + hash: "3f3c1137c02e14796c3a4537337d1dd8" } Frame { msec: 1456 - hash: "d843ec499de0a7c0094a479f75cab4c6" + hash: "4997a45af699c1face114c72a9ce067d" } Frame { msec: 1472 - hash: "25cf1c1efce5ad53695099ffeb93d27f" + hash: "093cce71722904a32b030478f3af49bb" } Frame { msec: 1488 - hash: "25cf1c1efce5ad53695099ffeb93d27f" + hash: "093cce71722904a32b030478f3af49bb" } Frame { msec: 1504 - hash: "25cf1c1efce5ad53695099ffeb93d27f" + hash: "093cce71722904a32b030478f3af49bb" } Frame { msec: 1520 - hash: "25cf1c1efce5ad53695099ffeb93d27f" + hash: "093cce71722904a32b030478f3af49bb" } Frame { msec: 1536 - hash: "25cf1c1efce5ad53695099ffeb93d27f" + hash: "093cce71722904a32b030478f3af49bb" } Frame { msec: 1552 - hash: "25cf1c1efce5ad53695099ffeb93d27f" + hash: "093cce71722904a32b030478f3af49bb" } Frame { msec: 1568 - hash: "444090b334e856ff4f9b9938c7676666" + hash: "a4810a97e51259350bb1543dffc156af" } Frame { msec: 1584 - hash: "6064d9310e5d660c8e1aae9e9cfc6bd3" + hash: "838871072acbefc1c8c488f47312da9b" } Frame { msec: 1600 - hash: "fc562db867e30ac63a9992b3cf554553" + hash: "8cfe8847729878519669caa8b702d910" } Frame { msec: 1616 - hash: "e127594d11d3e4c0d1f3e4585ef3a901" + hash: "a2fd8e049d03b87a306bb5b81e3f7311" } Frame { msec: 1632 - hash: "6d3d43b6a38cf1c64289282bbcaf2ac2" + hash: "29bd4d5e36cb6b232f513b6bb0c00b28" } Frame { msec: 1648 - hash: "bd58d75020a5272ae3cdcb0ed780e496" + hash: "9637f14efb2e355bfe886d7c5f2a8d38" } Key { type: 6 @@ -498,35 +498,35 @@ VisualTest { } Frame { msec: 1664 - hash: "655cdefae8b30a40e6baaa04b790f811" + hash: "0365fa8845c3c1e53ef35d22423eb973" } Frame { msec: 1680 - hash: "a654e6c9c5414593425bd2ccc6a0f916" + hash: "bf88d5d2cd2ff062c1cc8a391a238b1d" } Frame { msec: 1696 - hash: "88e3865dcb7da6be36cff12a1da7c94b" + hash: "46b22f33eb80f013e44da11153441864" } Frame { msec: 1712 - hash: "4d85866e40d8118081d2747af7343c42" + hash: "05ae42e3a0296a569dec147c76be273d" } Frame { msec: 1728 - hash: "d84111903e76a53be7b55d7dc3847914" + hash: "1a8cc65973d08bb949f7a71b0bb8be1a" } Frame { msec: 1744 - hash: "4f7b708a511dc7a882af661ca3282404" + hash: "ca3bde8cd8de81c4210fcfd000fe0f5e" } Frame { msec: 1760 - hash: "29d940c479f0c76c6f4d88e417672878" + hash: "e06d104d1ed451eea4c1d9bdae9d10f4" } Frame { msec: 1776 - hash: "ade916241f4b2a50e6b84f8ae41369ef" + hash: "c95153ae401ad8a2e839905841c074f3" } Key { type: 6 @@ -538,35 +538,35 @@ VisualTest { } Frame { msec: 1792 - hash: "ecd42368bf2a9058185b9b25b659f4c6" + hash: "82e61a4d3f58ee5104893e254a77f13e" } Frame { msec: 1808 - hash: "7937850b86f3611ee1d75da9deb7420d" + hash: "5f073a4a89413b6a6c5d6ff52717bb2f" } Frame { msec: 1824 - hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6" + hash: "b0fd95dc2ac09a1cbd67ad0f86682666" } Frame { msec: 1840 - hash: "0a2c07dc17922651d2abd6400fff6e43" + hash: "78b16507899c3c8de04b55389ea0ad49" } Frame { msec: 1856 - hash: "c3df3735586ed103d137d4902d7a1cc3" + hash: "373c57edb812db59f40710305d80e9e9" } Frame { msec: 1872 - hash: "690aa50862a887edcc9392d1c3ca0424" + hash: "a7142c3c1eb9c934e0b258c163fcdfec" } Frame { msec: 1888 - hash: "56cc00965e12254e0133fe1d914fffb2" + hash: "bd5395e7e0aa0d50cb30504f9961c954" } Frame { msec: 1904 - hash: "fa7d20c99cb8c20494b558ce8ef860a2" + hash: "7031966f014d4acd5b00c46c89f61403" } Key { type: 7 @@ -582,79 +582,79 @@ VisualTest { } Frame { msec: 1936 - hash: "e8cd9511f073ff40a6645ad6aa2b5bee" + hash: "97dabf3984492d2f868b36c3e7bfce50" } Frame { msec: 1952 - hash: "b5e956f236ba52cb673af22417d1aabc" + hash: "afe0c3fdcb498f1f6b877c5d808b2555" } Frame { msec: 1968 - hash: "b297d098f02fbbeac830b20b0a5194c5" + hash: "7610775f69a461d5487e8bc3db6b6e1f" } Frame { msec: 1984 - hash: "c711fd5d0c3900494493f8309b79ad0c" + hash: "52641f9d6dfba8bf2b94aa37ade140d1" } Frame { msec: 2000 - hash: "c9bf546976fc17de9ea9e877f4978f02" + hash: "9d0e449506ce93052216b7a952af3dea" } Frame { msec: 2016 - hash: "fd83046af94eac26d394a5da986e734c" + hash: "c1bb09480464b7813bc10b0093d14745" } Frame { msec: 2032 - hash: "c9bf546976fc17de9ea9e877f4978f02" + hash: "9d0e449506ce93052216b7a952af3dea" } Frame { msec: 2048 - hash: "c711fd5d0c3900494493f8309b79ad0c" + hash: "52641f9d6dfba8bf2b94aa37ade140d1" } Frame { msec: 2064 - hash: "b297d098f02fbbeac830b20b0a5194c5" + hash: "7610775f69a461d5487e8bc3db6b6e1f" } Frame { msec: 2080 - hash: "b5e956f236ba52cb673af22417d1aabc" + hash: "afe0c3fdcb498f1f6b877c5d808b2555" } Frame { msec: 2096 - hash: "e8cd9511f073ff40a6645ad6aa2b5bee" + hash: "97dabf3984492d2f868b36c3e7bfce50" } Frame { msec: 2112 - hash: "315734f8f38efbc810ca2e65bd752ddd" + hash: "869624c2ae63b0a447401a955a6fefb1" } Frame { msec: 2128 - hash: "fa7d20c99cb8c20494b558ce8ef860a2" + hash: "7031966f014d4acd5b00c46c89f61403" } Frame { msec: 2144 - hash: "56cc00965e12254e0133fe1d914fffb2" + hash: "bd5395e7e0aa0d50cb30504f9961c954" } Frame { msec: 2160 - hash: "690aa50862a887edcc9392d1c3ca0424" + hash: "a7142c3c1eb9c934e0b258c163fcdfec" } Frame { msec: 2176 - hash: "c3df3735586ed103d137d4902d7a1cc3" + hash: "373c57edb812db59f40710305d80e9e9" } Frame { msec: 2192 - hash: "0a2c07dc17922651d2abd6400fff6e43" + hash: "78b16507899c3c8de04b55389ea0ad49" } Frame { msec: 2208 - hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6" + hash: "b0fd95dc2ac09a1cbd67ad0f86682666" } Frame { msec: 2224 - hash: "7937850b86f3611ee1d75da9deb7420d" + hash: "5f073a4a89413b6a6c5d6ff52717bb2f" } Key { type: 7 @@ -666,35 +666,35 @@ VisualTest { } Frame { msec: 2240 - hash: "ecd42368bf2a9058185b9b25b659f4c6" + hash: "82e61a4d3f58ee5104893e254a77f13e" } Frame { msec: 2256 - hash: "e545c6ba42edd1e6a055b48f162315ab" + hash: "a8fe05178e6339454d57575692fa3df3" } Frame { msec: 2272 - hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7" + hash: "192f80add5f612b07dcb8d69f2161648" } Frame { msec: 2288 - hash: "49de66674e8f38f925f3505c64201076" + hash: "cfd85885f59ea80b0b0152446a829fec" } Frame { msec: 2304 - hash: "b33880917cae07d038620065ec2c1d1c" + hash: "a7295dcc92f80a5f343bf05076a03748" } Frame { msec: 2320 - hash: "97c8af8dc7e5372a3a0f5bed0050127e" + hash: "2b0b30cfb1c1e4ed8a51d36fb7ccdf57" } Frame { msec: 2336 - hash: "b0236b8c44398cb9f97324f6ca9ce5c4" + hash: "419c538908d0226ff4485f1094eaa08e" } Frame { msec: 2352 - hash: "2695b45a1ea89518d236ef3b8dccd89e" + hash: "8afe64448d42419f97ca207487b3b0f8" } Key { type: 6 @@ -706,35 +706,35 @@ VisualTest { } Frame { msec: 2368 - hash: "61370b1d04626facfd243176cb4bb79b" + hash: "86091218d2d066d8f95a460426266369" } Frame { msec: 2384 - hash: "53c53e501469ca0ef0f0325a13aa4aa4" + hash: "fc45978cac92b6cdeeecc2dd4c29aa53" } Frame { msec: 2400 - hash: "c56717a79ccffe756c5423bc5e44a53f" + hash: "03a90ae5cbe68cc210e303c78a14e065" } Frame { msec: 2416 - hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b" + hash: "15603a997aa02afb688aa74cd930f3b4" } Frame { msec: 2432 - hash: "4ccb9af28572e13f961f2057eb98482d" + hash: "90bf6b2bf89e1440f0c4d1044c1bd22c" } Frame { msec: 2448 - hash: "0b8ce455fd40c3cd74fb05d4b603cceb" + hash: "4dbdc16538cbbf1a87c6a54e09e02b16" } Frame { msec: 2464 - hash: "f5c3754201dbb6f4ca4f4c1611036c5a" + hash: "2011ee59d2ec4bb0ae0d63727f091648" } Frame { msec: 2480 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Key { type: 7 @@ -746,95 +746,95 @@ VisualTest { } Frame { msec: 2496 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 2512 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 2528 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 2544 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 2560 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 2576 - hash: "3c1972940b70a388ebfd007b0b5d9860" + hash: "02996bef06c74f34cf8be4cf4d1392d5" } Frame { msec: 2592 - hash: "674707d6ae5ef5109940f1bd62427a63" + hash: "2d8cb2d213ce22132ba63a829c07f768" } Frame { msec: 2608 - hash: "8f512390b74d7a545eb60a86d4b8dee6" + hash: "0a16c282a18fdc657ea48fb208dea494" } Frame { msec: 2624 - hash: "0502cfe70da38a6ebccd7fdf799be464" + hash: "86baec52ccb8ae818439c637c5be1514" } Frame { msec: 2640 - hash: "23c45beae15b893ec4450b0d380aeb17" + hash: "72e2415581ba2a96b8f23cf8f5985afb" } Frame { msec: 2656 - hash: "45de58892db757e76c95ddb76e267f6f" + hash: "7776d964b2b5f80bac51a29d298a067f" } Frame { msec: 2672 - hash: "ff3f1529c937c4d95cf4dfb8592759dc" + hash: "3b5d0a9f961c2102a4118a8e2d2793ae" } Frame { msec: 2688 - hash: "236c6e16bbfab9268f488d6dbf9544be" + hash: "048b5e51d9bcf8d1b24c8f8f98b7b4e4" } Frame { msec: 2704 - hash: "3bb19cbddf5e66c08bdd5c881e93db3e" + hash: "d30e5d7c27b72ec95c41a87741061a3f" } Frame { msec: 2720 - hash: "057ea6d1007993908c9c398391b85072" + hash: "0374cc41cdb6528e212f678e0e049f2b" } Frame { msec: 2736 - hash: "faa124cd5d0a027dc5e3b92125bc9cc5" + hash: "c80bc90c90b02d1d42176f16fa992f27" } Frame { msec: 2752 - hash: "234ac2e7f0b87a86e0678e3cbc5a1e30" + hash: "70182707dbdf87a2c8db556f030bec17" } Frame { msec: 2768 - hash: "bdee3016f1811188691786bafe305196" + hash: "0c6c0c3d27d87128d65b40789714dd6b" } Frame { msec: 2784 - hash: "9ecc192aec9b15314132b16dd3f43860" + hash: "46e1debee4ca606492a36de6191f4594" } Frame { msec: 2800 - hash: "26dc03cf86d6812cfb788599b1c34de0" + hash: "f327bb2ea12b2baffc0a98d44a0ded16" } Frame { msec: 2816 - hash: "8752b33ae49ea6d1ee27376d8585776e" + hash: "15bc04b65bde5e8ca69b6a1f88647c16" } Frame { msec: 2832 - hash: "a181b264ba729ad1d8ff91a0c56fb98a" + hash: "27156c3309835ec20a02877f1188e14a" } Frame { msec: 2848 - hash: "af426cd28c90ac2d46d2b2478ce616f3" + hash: "a163019c9feff0f4d1bb4aaedcd2ecd4" } Key { type: 6 @@ -846,7 +846,7 @@ VisualTest { } Frame { msec: 2864 - hash: "7462f7f9c339fc4d8b0c08e54b0ed71d" + hash: "c5569c3c06bcf01b7e69e7f7ad6203ef" } Frame { msec: 2880 @@ -854,27 +854,27 @@ VisualTest { } Frame { msec: 2896 - hash: "10f5b360c3809fbe51de55f47199c541" + hash: "5d1c41e371b1a95426882b3991383b6b" } Frame { msec: 2912 - hash: "ecab3f62c89e1cb9ff9b10ace4cdb40b" + hash: "4b9581a767fc1c94451780c044baf003" } Frame { msec: 2928 - hash: "d3eac9d8cd01bbb44fd61fca497230c0" + hash: "39978ba9bb1a535d7735228c650add38" } Frame { msec: 2944 - hash: "33ff6af85e783c617a42ca5021d1463b" + hash: "1a2afe394227dcf2da118559e2e58fd7" } Frame { msec: 2960 - hash: "a53cccc463d6f6fc24dc0d6309246640" + hash: "2f6bdb7af9bf9334231180b6113b125f" } Frame { msec: 2976 - hash: "8fc354dd6ddbd829240a3c2c9dcafdeb" + hash: "85017ca5ca286830e2745abf2f1f963a" } Key { type: 7 @@ -886,63 +886,63 @@ VisualTest { } Frame { msec: 2992 - hash: "0529a6cb7083caf513de4677970ed33f" + hash: "3760b42a25e332c6df49bd92109dae98" } Frame { msec: 3008 - hash: "bb38f9cdd67d18bc9297b353d499bb35" + hash: "7c0347f97f9e4d7fcf47a90b336d264a" } Frame { msec: 3024 - hash: "bb38f9cdd67d18bc9297b353d499bb35" + hash: "7c0347f97f9e4d7fcf47a90b336d264a" } Frame { msec: 3040 - hash: "0529a6cb7083caf513de4677970ed33f" + hash: "3760b42a25e332c6df49bd92109dae98" } Frame { msec: 3056 - hash: "8fc354dd6ddbd829240a3c2c9dcafdeb" + hash: "85017ca5ca286830e2745abf2f1f963a" } Frame { msec: 3072 - hash: "a53cccc463d6f6fc24dc0d6309246640" + hash: "2f6bdb7af9bf9334231180b6113b125f" } Frame { msec: 3088 - hash: "33ff6af85e783c617a42ca5021d1463b" + hash: "1a2afe394227dcf2da118559e2e58fd7" } Frame { msec: 3104 - hash: "d3eac9d8cd01bbb44fd61fca497230c0" + hash: "39978ba9bb1a535d7735228c650add38" } Frame { msec: 3120 - hash: "ecab3f62c89e1cb9ff9b10ace4cdb40b" + hash: "4b9581a767fc1c94451780c044baf003" } Frame { msec: 3136 - hash: "10f5b360c3809fbe51de55f47199c541" + hash: "5d1c41e371b1a95426882b3991383b6b" } Frame { msec: 3152 - hash: "2a0b3f5170c31a2f2ae512ab3c4268fc" + hash: "73c771b964becb418289e0674571eb6f" } Frame { msec: 3168 - hash: "7462f7f9c339fc4d8b0c08e54b0ed71d" + hash: "c5569c3c06bcf01b7e69e7f7ad6203ef" } Frame { msec: 3184 - hash: "0367ee5e3204a54d225791fbd833fc21" + hash: "7c55078e04b56c9aba7d227917323021" } Frame { msec: 3200 - hash: "86f96b2b846cad8660d80f7dbda24806" + hash: "01c6b78b296c00e4597ae1bd36a65f3a" } Frame { msec: 3216 - hash: "ce05bb9e0a7bd884c12f100b9d219461" + hash: "67e9271f71b2d6d9eb2e230953db06c5" } Key { type: 6 @@ -954,31 +954,31 @@ VisualTest { } Frame { msec: 3232 - hash: "8b04473fad0ffec6b56d2dca8d4dd81c" + hash: "642a6f4d7b3f467263b8e033578927af" } Frame { msec: 3248 - hash: "cedcf233a83047beef7a8aa3486df671" + hash: "9f000f97b33427860cb5daeb259c72ea" } Frame { msec: 3264 - hash: "8117b9590a36bbb4fd0d73c1df2e655e" + hash: "d74e3f977b5decb89dda46ea608a933a" } Frame { msec: 3280 - hash: "5c3168c676a7dc35913e365b2acafea1" + hash: "f4e446cd96a3eb1a0df83cf032e7a0b2" } Frame { msec: 3296 - hash: "4314ebdafbfbad5f108a4cb9874ed06c" + hash: "abe715855a79a8ced43000884c4bf04b" } Frame { msec: 3312 - hash: "d2ffe99b443ecf1188bd3639ddbccda3" + hash: "29fd5c17b9a169c1850aa538b4006084" } Frame { msec: 3328 - hash: "a0894a3492ed7e5bf5b834db890325e2" + hash: "cefdcaebb9c319ac358b0d7fc9424327" } Key { type: 7 @@ -990,103 +990,103 @@ VisualTest { } Frame { msec: 3344 - hash: "57498e86bdc3cfd37bf29505c289d100" + hash: "85bfa23957bb5cd947e0819ffa442ea3" } Frame { msec: 3360 - hash: "57d77411f30c4733f2afec2fc99f3d0b" + hash: "48f18d9d12331dc8725ea9e4b7f79823" } Frame { msec: 3376 - hash: "a3c4b4fef44c4019daba366c1e3a58b1" + hash: "63cde59ffbbe2b9087ca228733de18dd" } Frame { msec: 3392 - hash: "f8461558248b7da3bdf2df641154171a" + hash: "73f5d4594f23ff4aac5e42aee00dce81" } Frame { msec: 3408 - hash: "13e84656ef70bf07e2a444d60ac933e1" + hash: "51a1b8e79d209643d55d4cecc6a70ed0" } Frame { msec: 3424 - hash: "186d8a59092cfe4128b46a3c87eb347b" + hash: "7f2ae476246b23d79997a2545723ff62" } Frame { msec: 3440 - hash: "ac4898002fdc5ea7894d741cac863c8d" + hash: "996da2eff9302908a55308dbcc8fb3c2" } Frame { msec: 3456 - hash: "2e95c1966c94acccd2a44a6c2942d36d" + hash: "264f34128dfe563126b9f187c65df61e" } Frame { msec: 3472 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 3488 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 3504 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 3520 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 3536 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 3552 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 3568 - hash: "7f83ba29fd27aa4817b7b84afbc8d6d7" + hash: "70d6b73499c36138bee63e07afb0b186" } Frame { msec: 3584 - hash: "8575a99b28bb5b8c2d01a5ed91f25d47" + hash: "66500c2cc3d69b9fb48dc46e384aca6d" } Frame { msec: 3600 - hash: "eda67cb2d32f3f605a74a01148f04c99" + hash: "6ccc70f6120acb53152b71bcf95514ca" } Frame { msec: 3616 - hash: "1d65e6e7160f092fe65f683df7c10f92" + hash: "5c10e6b0e541fe913b589601a55ea6ce" } Frame { msec: 3632 - hash: "274c59f268f667a1f11b8ea04a4f88a0" + hash: "2c62584e4c09c1d22f9016aa6fa74e10" } Frame { msec: 3648 - hash: "e46d917e79910b3319c4579776bbdd60" + hash: "fd8f53e36a86ae22deb4f7af5aa1eb81" } Frame { msec: 3664 - hash: "42b7662aad44804653101117ca698023" + hash: "e33226eb0e81a64bed7bcdb50e99cd13" } Frame { msec: 3680 - hash: "dda5147cb6e4e8f61819de6a90dcb165" + hash: "a7053a2b7bc9f4749c290bace6b55634" } Frame { msec: 3696 - hash: "b4a5dcd0bb667d3a42c8f0703d753ed6" + hash: "782cb4e647e849ac7299d41f04bc89e3" } Frame { msec: 3712 - hash: "4ae70de6785fdbecf7650637c8e99a71" + hash: "0f7d04fe594ae027364a7c2b570c5a27" } Frame { msec: 3728 - hash: "22dc8343eab28b0526d5486405b68478" + hash: "dfb00adcdc2f68bfb691bce47845b0e7" } Key { type: 6 @@ -1098,27 +1098,27 @@ VisualTest { } Frame { msec: 3744 - hash: "49de66674e8f38f925f3505c64201076" + hash: "cfd85885f59ea80b0b0152446a829fec" } Frame { msec: 3760 - hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7" + hash: "192f80add5f612b07dcb8d69f2161648" } Frame { msec: 3776 - hash: "e545c6ba42edd1e6a055b48f162315ab" + hash: "a8fe05178e6339454d57575692fa3df3" } Frame { msec: 3792 - hash: "ecd42368bf2a9058185b9b25b659f4c6" + hash: "82e61a4d3f58ee5104893e254a77f13e" } Frame { msec: 3808 - hash: "7937850b86f3611ee1d75da9deb7420d" + hash: "5f073a4a89413b6a6c5d6ff52717bb2f" } Frame { msec: 3824 - hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6" + hash: "b0fd95dc2ac09a1cbd67ad0f86682666" } Frame { msec: 3840 @@ -1134,59 +1134,59 @@ VisualTest { } Frame { msec: 3856 - hash: "c3df3735586ed103d137d4902d7a1cc3" + hash: "373c57edb812db59f40710305d80e9e9" } Frame { msec: 3872 - hash: "690aa50862a887edcc9392d1c3ca0424" + hash: "a7142c3c1eb9c934e0b258c163fcdfec" } Frame { msec: 3888 - hash: "56cc00965e12254e0133fe1d914fffb2" + hash: "bd5395e7e0aa0d50cb30504f9961c954" } Frame { msec: 3904 - hash: "fa7d20c99cb8c20494b558ce8ef860a2" + hash: "7031966f014d4acd5b00c46c89f61403" } Frame { msec: 3920 - hash: "315734f8f38efbc810ca2e65bd752ddd" + hash: "869624c2ae63b0a447401a955a6fefb1" } Frame { msec: 3936 - hash: "e8cd9511f073ff40a6645ad6aa2b5bee" + hash: "97dabf3984492d2f868b36c3e7bfce50" } Frame { msec: 3952 - hash: "b5e956f236ba52cb673af22417d1aabc" + hash: "afe0c3fdcb498f1f6b877c5d808b2555" } Frame { msec: 3968 - hash: "b297d098f02fbbeac830b20b0a5194c5" + hash: "7610775f69a461d5487e8bc3db6b6e1f" } Frame { msec: 3984 - hash: "c711fd5d0c3900494493f8309b79ad0c" + hash: "52641f9d6dfba8bf2b94aa37ade140d1" } Frame { msec: 4000 - hash: "c9bf546976fc17de9ea9e877f4978f02" + hash: "9d0e449506ce93052216b7a952af3dea" } Frame { msec: 4016 - hash: "fd83046af94eac26d394a5da986e734c" + hash: "c1bb09480464b7813bc10b0093d14745" } Frame { msec: 4032 - hash: "c9bf546976fc17de9ea9e877f4978f02" + hash: "9d0e449506ce93052216b7a952af3dea" } Frame { msec: 4048 - hash: "c711fd5d0c3900494493f8309b79ad0c" + hash: "52641f9d6dfba8bf2b94aa37ade140d1" } Frame { msec: 4064 - hash: "b297d098f02fbbeac830b20b0a5194c5" + hash: "7610775f69a461d5487e8bc3db6b6e1f" } Key { type: 7 @@ -1198,183 +1198,183 @@ VisualTest { } Frame { msec: 4080 - hash: "b5e956f236ba52cb673af22417d1aabc" + hash: "afe0c3fdcb498f1f6b877c5d808b2555" } Frame { msec: 4096 - hash: "e8cd9511f073ff40a6645ad6aa2b5bee" + hash: "97dabf3984492d2f868b36c3e7bfce50" } Frame { msec: 4112 - hash: "315734f8f38efbc810ca2e65bd752ddd" + hash: "869624c2ae63b0a447401a955a6fefb1" } Frame { msec: 4128 - hash: "fa7d20c99cb8c20494b558ce8ef860a2" + hash: "7031966f014d4acd5b00c46c89f61403" } Frame { msec: 4144 - hash: "56cc00965e12254e0133fe1d914fffb2" + hash: "bd5395e7e0aa0d50cb30504f9961c954" } Frame { msec: 4160 - hash: "690aa50862a887edcc9392d1c3ca0424" + hash: "a7142c3c1eb9c934e0b258c163fcdfec" } Frame { msec: 4176 - hash: "c3df3735586ed103d137d4902d7a1cc3" + hash: "373c57edb812db59f40710305d80e9e9" } Frame { msec: 4192 - hash: "0a2c07dc17922651d2abd6400fff6e43" + hash: "78b16507899c3c8de04b55389ea0ad49" } Frame { msec: 4208 - hash: "8004e4ab3ed02f68f6f5f7f5fb9fe6c6" + hash: "b0fd95dc2ac09a1cbd67ad0f86682666" } Frame { msec: 4224 - hash: "7937850b86f3611ee1d75da9deb7420d" + hash: "5f073a4a89413b6a6c5d6ff52717bb2f" } Frame { msec: 4240 - hash: "ecd42368bf2a9058185b9b25b659f4c6" + hash: "82e61a4d3f58ee5104893e254a77f13e" } Frame { msec: 4256 - hash: "e545c6ba42edd1e6a055b48f162315ab" + hash: "a8fe05178e6339454d57575692fa3df3" } Frame { msec: 4272 - hash: "f8b28cd90fe0c4aa90e8a69d2d9cdce7" + hash: "192f80add5f612b07dcb8d69f2161648" } Frame { msec: 4288 - hash: "49de66674e8f38f925f3505c64201076" + hash: "cfd85885f59ea80b0b0152446a829fec" } Frame { msec: 4304 - hash: "b33880917cae07d038620065ec2c1d1c" + hash: "a7295dcc92f80a5f343bf05076a03748" } Frame { msec: 4320 - hash: "97c8af8dc7e5372a3a0f5bed0050127e" + hash: "2b0b30cfb1c1e4ed8a51d36fb7ccdf57" } Frame { msec: 4336 - hash: "b0236b8c44398cb9f97324f6ca9ce5c4" + hash: "419c538908d0226ff4485f1094eaa08e" } Frame { msec: 4352 - hash: "2695b45a1ea89518d236ef3b8dccd89e" + hash: "8afe64448d42419f97ca207487b3b0f8" } Frame { msec: 4368 - hash: "61370b1d04626facfd243176cb4bb79b" + hash: "86091218d2d066d8f95a460426266369" } Frame { msec: 4384 - hash: "53c53e501469ca0ef0f0325a13aa4aa4" + hash: "fc45978cac92b6cdeeecc2dd4c29aa53" } Frame { msec: 4400 - hash: "c56717a79ccffe756c5423bc5e44a53f" + hash: "03a90ae5cbe68cc210e303c78a14e065" } Frame { msec: 4416 - hash: "e5ec3e6d4a7a527e8f2c0afa5fd66c4b" + hash: "15603a997aa02afb688aa74cd930f3b4" } Frame { msec: 4432 - hash: "4ccb9af28572e13f961f2057eb98482d" + hash: "90bf6b2bf89e1440f0c4d1044c1bd22c" } Frame { msec: 4448 - hash: "0b8ce455fd40c3cd74fb05d4b603cceb" + hash: "4dbdc16538cbbf1a87c6a54e09e02b16" } Frame { msec: 4464 - hash: "f5c3754201dbb6f4ca4f4c1611036c5a" + hash: "2011ee59d2ec4bb0ae0d63727f091648" } Frame { msec: 4480 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4496 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4512 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4528 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4544 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4560 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4576 - hash: "3c1972940b70a388ebfd007b0b5d9860" + hash: "02996bef06c74f34cf8be4cf4d1392d5" } Frame { msec: 4592 - hash: "674707d6ae5ef5109940f1bd62427a63" + hash: "2d8cb2d213ce22132ba63a829c07f768" } Frame { msec: 4608 - hash: "8f512390b74d7a545eb60a86d4b8dee6" + hash: "0a16c282a18fdc657ea48fb208dea494" } Frame { msec: 4624 - hash: "0502cfe70da38a6ebccd7fdf799be464" + hash: "86baec52ccb8ae818439c637c5be1514" } Frame { msec: 4640 - hash: "23c45beae15b893ec4450b0d380aeb17" + hash: "72e2415581ba2a96b8f23cf8f5985afb" } Frame { msec: 4656 - hash: "45de58892db757e76c95ddb76e267f6f" + hash: "7776d964b2b5f80bac51a29d298a067f" } Frame { msec: 4672 - hash: "ff3f1529c937c4d95cf4dfb8592759dc" + hash: "3b5d0a9f961c2102a4118a8e2d2793ae" } Frame { msec: 4688 - hash: "236c6e16bbfab9268f488d6dbf9544be" + hash: "048b5e51d9bcf8d1b24c8f8f98b7b4e4" } Frame { msec: 4704 - hash: "3bb19cbddf5e66c08bdd5c881e93db3e" + hash: "d30e5d7c27b72ec95c41a87741061a3f" } Frame { msec: 4720 - hash: "057ea6d1007993908c9c398391b85072" + hash: "0374cc41cdb6528e212f678e0e049f2b" } Frame { msec: 4736 - hash: "faa124cd5d0a027dc5e3b92125bc9cc5" + hash: "c80bc90c90b02d1d42176f16fa992f27" } Frame { msec: 4752 - hash: "234ac2e7f0b87a86e0678e3cbc5a1e30" + hash: "70182707dbdf87a2c8db556f030bec17" } Frame { msec: 4768 - hash: "bdee3016f1811188691786bafe305196" + hash: "0c6c0c3d27d87128d65b40789714dd6b" } Frame { msec: 4784 - hash: "9ecc192aec9b15314132b16dd3f43860" + hash: "46e1debee4ca606492a36de6191f4594" } Frame { msec: 4800 @@ -1382,118 +1382,118 @@ VisualTest { } Frame { msec: 4816 - hash: "8752b33ae49ea6d1ee27376d8585776e" + hash: "15bc04b65bde5e8ca69b6a1f88647c16" } Frame { msec: 4832 - hash: "a181b264ba729ad1d8ff91a0c56fb98a" + hash: "27156c3309835ec20a02877f1188e14a" } Frame { msec: 4848 - hash: "af426cd28c90ac2d46d2b2478ce616f3" + hash: "a163019c9feff0f4d1bb4aaedcd2ecd4" } Frame { msec: 4864 - hash: "d062f03ccc0eb1f56aba411e1078c4ab" + hash: "35f243da98f9934d5ac0a7cc1fde73ef" } Frame { msec: 4880 - hash: "793cb0a98cac4a0f5d9a1dc5df5cd0ce" + hash: "42d393d75e0c1d5aea0e1694190e4507" } Frame { msec: 4896 - hash: "da1f9732e1d7cd0b82f0c0949937067e" + hash: "0ec47c6c74efd66d339d9be13148e334" } Frame { msec: 4912 - hash: "35d38ce67e19453f255241473294f7e9" + hash: "2e7597e8d03f0a05cf96fe7e2a3ee540" } Frame { msec: 4928 - hash: "e8c5d9895119167f2fcb4a15b0f1b65e" + hash: "093c9e5ac431284de7e81e082868c5db" } Frame { msec: 4944 - hash: "26c0d91942f1cb3313d604804d1e4b9e" + hash: "60ae71c4a6c905f47b2b457d9167153b" } Frame { msec: 4960 - hash: "eaf1ba458119f6d3dedcd581d5c04f8c" + hash: "e4be7897b1b30ab916a53df2998282d7" } Frame { msec: 4976 - hash: "a54c778d78c9a715ce0429e9c366ef8b" + hash: "c082b97799dffdb73ad65b2920507e9c" } Frame { msec: 4992 - hash: "f3a8edba1311c54a12024dbcf1656b85" + hash: "aadaab0547a4f15c533589b531f39504" } Frame { msec: 5008 - hash: "7c5c30318c41ab5c5874239bbcfbaae2" + hash: "847f0a1faf094e73d533692fa47a030a" } Frame { msec: 5024 - hash: "7c5c30318c41ab5c5874239bbcfbaae2" + hash: "847f0a1faf094e73d533692fa47a030a" } Frame { msec: 5040 - hash: "f3a8edba1311c54a12024dbcf1656b85" + hash: "aadaab0547a4f15c533589b531f39504" } Frame { msec: 5056 - hash: "a54c778d78c9a715ce0429e9c366ef8b" + hash: "c082b97799dffdb73ad65b2920507e9c" } Frame { msec: 5072 - hash: "eaf1ba458119f6d3dedcd581d5c04f8c" + hash: "e4be7897b1b30ab916a53df2998282d7" } Frame { msec: 5088 - hash: "26c0d91942f1cb3313d604804d1e4b9e" + hash: "60ae71c4a6c905f47b2b457d9167153b" } Frame { msec: 5104 - hash: "e8c5d9895119167f2fcb4a15b0f1b65e" + hash: "093c9e5ac431284de7e81e082868c5db" } Frame { msec: 5120 - hash: "35d38ce67e19453f255241473294f7e9" + hash: "2e7597e8d03f0a05cf96fe7e2a3ee540" } Frame { msec: 5136 - hash: "da1f9732e1d7cd0b82f0c0949937067e" + hash: "0ec47c6c74efd66d339d9be13148e334" } Frame { msec: 5152 - hash: "793cb0a98cac4a0f5d9a1dc5df5cd0ce" + hash: "42d393d75e0c1d5aea0e1694190e4507" } Frame { msec: 5168 - hash: "d062f03ccc0eb1f56aba411e1078c4ab" + hash: "35f243da98f9934d5ac0a7cc1fde73ef" } Frame { msec: 5184 - hash: "af426cd28c90ac2d46d2b2478ce616f3" + hash: "a163019c9feff0f4d1bb4aaedcd2ecd4" } Frame { msec: 5200 - hash: "a181b264ba729ad1d8ff91a0c56fb98a" + hash: "27156c3309835ec20a02877f1188e14a" } Frame { msec: 5216 - hash: "8752b33ae49ea6d1ee27376d8585776e" + hash: "15bc04b65bde5e8ca69b6a1f88647c16" } Frame { msec: 5232 - hash: "26dc03cf86d6812cfb788599b1c34de0" + hash: "f327bb2ea12b2baffc0a98d44a0ded16" } Frame { msec: 5248 - hash: "9ecc192aec9b15314132b16dd3f43860" + hash: "46e1debee4ca606492a36de6191f4594" } Frame { msec: 5264 - hash: "bdee3016f1811188691786bafe305196" + hash: "0c6c0c3d27d87128d65b40789714dd6b" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png Binary files differindex c4bf75d..dfd30f6 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png Binary files differindex f28b342..9d4eb9b 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png Binary files differindex 955aed7..968517e 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png Binary files differindex 02ac575..eb62c19 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml index 8d14a2b..a7df61f 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/qt-669.qml @@ -6,99 +6,99 @@ VisualTest { } Frame { msec: 16 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 32 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 48 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 64 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 80 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 96 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 112 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 128 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 144 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 160 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 176 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 192 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 208 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 224 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 240 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 256 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 272 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 288 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 304 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 320 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 336 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 352 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 368 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 384 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Key { type: 6 @@ -110,15 +110,15 @@ VisualTest { } Frame { msec: 400 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 416 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 432 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Key { type: 7 @@ -130,27 +130,27 @@ VisualTest { } Frame { msec: 448 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 464 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 480 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 496 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 512 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 528 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Key { type: 6 @@ -162,15 +162,15 @@ VisualTest { } Frame { msec: 544 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 560 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 576 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Key { type: 7 @@ -182,27 +182,27 @@ VisualTest { } Frame { msec: 592 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 608 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 624 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 640 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 656 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 672 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Key { type: 6 @@ -214,19 +214,19 @@ VisualTest { } Frame { msec: 688 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 704 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 720 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 736 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Key { type: 7 @@ -238,23 +238,23 @@ VisualTest { } Frame { msec: 752 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 768 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 784 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 800 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 816 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Key { type: 6 @@ -266,19 +266,19 @@ VisualTest { } Frame { msec: 832 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 848 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 864 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 880 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Key { type: 7 @@ -290,19 +290,19 @@ VisualTest { } Frame { msec: 896 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 912 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 928 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 944 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Key { type: 6 @@ -318,15 +318,15 @@ VisualTest { } Frame { msec: 976 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 992 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 1008 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Key { type: 7 @@ -338,23 +338,23 @@ VisualTest { } Frame { msec: 1024 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 1040 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 1056 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 1072 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 1088 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Key { type: 6 @@ -366,15 +366,15 @@ VisualTest { } Frame { msec: 1104 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 1120 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 1136 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Key { type: 7 @@ -386,23 +386,23 @@ VisualTest { } Frame { msec: 1152 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 1168 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 1184 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 1200 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 1216 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Key { type: 6 @@ -414,19 +414,19 @@ VisualTest { } Frame { msec: 1232 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 1248 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 1264 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 1280 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Key { type: 7 @@ -438,19 +438,19 @@ VisualTest { } Frame { msec: 1296 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 1312 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 1328 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 1344 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Key { type: 6 @@ -462,19 +462,19 @@ VisualTest { } Frame { msec: 1360 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1376 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1392 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1408 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Key { type: 7 @@ -486,23 +486,23 @@ VisualTest { } Frame { msec: 1424 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1440 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1456 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1472 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1488 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Key { type: 6 @@ -514,15 +514,15 @@ VisualTest { } Frame { msec: 1504 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1520 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1536 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Key { type: 7 @@ -534,79 +534,79 @@ VisualTest { } Frame { msec: 1552 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1568 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1584 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1600 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1616 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1632 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1648 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1664 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1680 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1696 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1712 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1728 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1744 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1760 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1776 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1792 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1808 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1824 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Frame { msec: 1840 - hash: "2723a5a18241fd8787c2e298673e61e3" + hash: "ab021c71945620eba0b0cd70c7cffe5d" } Key { type: 6 @@ -618,19 +618,19 @@ VisualTest { } Frame { msec: 1856 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1872 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1888 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1904 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1920 @@ -638,19 +638,19 @@ VisualTest { } Frame { msec: 1936 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1952 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1968 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 1984 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Key { type: 7 @@ -662,23 +662,23 @@ VisualTest { } Frame { msec: 2000 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 2016 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 2032 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 2048 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Frame { msec: 2064 - hash: "730ff91304bee489409ea616678a9877" + hash: "2ce295d30754b14d889795d2192fef41" } Key { type: 6 @@ -690,23 +690,23 @@ VisualTest { } Frame { msec: 2080 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2096 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2112 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2128 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2144 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Key { type: 7 @@ -718,23 +718,23 @@ VisualTest { } Frame { msec: 2160 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2176 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2192 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2208 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Frame { msec: 2224 - hash: "8c9706e5cc1dd8cba4312aa07249ae74" + hash: "22bdd816325b5466ca937cf2535a3ef8" } Key { type: 6 @@ -746,11 +746,11 @@ VisualTest { } Frame { msec: 2240 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 2256 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Key { type: 7 @@ -762,23 +762,23 @@ VisualTest { } Frame { msec: 2272 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 2288 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 2304 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 2320 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Frame { msec: 2336 - hash: "d9af8bbbe324c23f69251847c64497d9" + hash: "a88ac2f56d3d75a277b0855e2baeda33" } Key { type: 6 @@ -790,15 +790,15 @@ VisualTest { } Frame { msec: 2352 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2368 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2384 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Key { type: 7 @@ -810,55 +810,55 @@ VisualTest { } Frame { msec: 2400 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2416 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2432 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2448 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2464 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2480 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2496 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2512 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2528 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2544 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2560 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2576 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Frame { msec: 2592 - hash: "9a3654cf08a913058fd47c072e09a5c8" + hash: "0873eebe3bbcb864644811670642028e" } Key { type: 6 @@ -870,23 +870,23 @@ VisualTest { } Frame { msec: 2608 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2624 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2640 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2656 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2672 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Key { type: 7 @@ -898,23 +898,23 @@ VisualTest { } Frame { msec: 2688 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2704 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2720 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2736 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Frame { msec: 2752 - hash: "dc2b08893d3ec12e2da923215eedf2de" + hash: "94d3da7909c84467c62deb2861104d21" } Key { type: 6 @@ -926,15 +926,15 @@ VisualTest { } Frame { msec: 2768 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 2784 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 2800 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Key { type: 7 @@ -946,19 +946,19 @@ VisualTest { } Frame { msec: 2816 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 2832 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 2848 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Frame { msec: 2864 - hash: "755c3478a46c430b058e99cf433942b8" + hash: "5a7abe3d30f7dc66c2cda37b03ff339f" } Key { type: 6 @@ -974,15 +974,15 @@ VisualTest { } Frame { msec: 2896 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 2912 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 2928 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Key { type: 7 @@ -994,23 +994,23 @@ VisualTest { } Frame { msec: 2944 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 2960 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 2976 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 2992 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Frame { msec: 3008 - hash: "dbc65e33a133cd8fa7669175de83d94a" + hash: "ddf97bfd6216415dd2a56871f19c2d49" } Key { type: 6 @@ -1022,23 +1022,23 @@ VisualTest { } Frame { msec: 3024 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3040 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3056 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3072 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3088 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Key { type: 7 @@ -1050,155 +1050,155 @@ VisualTest { } Frame { msec: 3104 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3120 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3136 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3152 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3168 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3184 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3200 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3216 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3232 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3248 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3264 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3280 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3296 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3312 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3328 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3344 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3360 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3376 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3392 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3408 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3424 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3440 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3456 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3472 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3488 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3504 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3520 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3536 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3552 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3568 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3584 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3600 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3616 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3632 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3648 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3664 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3680 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Frame { msec: 3696 - hash: "1e5621ab02591170fabc0d91c4a09c69" + hash: "5db508bc5a66018d9732cf8427461ef2" } Key { type: 6 @@ -1210,27 +1210,27 @@ VisualTest { } Frame { msec: 3712 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3728 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3744 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3760 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3776 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3792 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Key { type: 7 @@ -1242,11 +1242,11 @@ VisualTest { } Frame { msec: 3808 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3824 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3840 @@ -1254,118 +1254,118 @@ VisualTest { } Frame { msec: 3856 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3872 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3888 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3904 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3920 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3936 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3952 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3968 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 3984 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4000 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4016 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4032 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4048 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4064 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4080 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4096 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4112 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4128 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4144 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4160 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4176 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4192 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4208 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4224 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4240 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4256 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4272 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4288 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } Frame { msec: 4304 - hash: "7fc0cd5e044691bcef6a62d2fb6cd2d4" + hash: "9d4f0f25239a53ed9ac917df0c4a5f8e" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png Binary files differindex a3f0089..5049c3f 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png Binary files differindex 95772a9..ee6e16a 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png Binary files differindex 1b280eb..d9d2252 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png Binary files differindex 1b280eb..d9d2252 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png Binary files differindex cdd3dc0..cf99d98 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png Binary files differindex a3115f6..e3937f0 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png Binary files differindex d2c895b..2fe3337 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png Binary files differindex e0e1ced..97b9913 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png Binary files differindex bde3d7d..08e059f 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png Binary files differindex 38bf8be..bbc5ba2 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png Binary files differindex 7475f96..465b64e 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png Binary files differindex 1b280eb..d9d2252 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml index c12ee51..a8173be 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.qml @@ -6,83 +6,83 @@ VisualTest { } Frame { msec: 16 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 32 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 48 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 64 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 80 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 96 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 112 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 128 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 144 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 160 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 176 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 192 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 208 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 224 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 240 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 256 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 272 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 288 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 304 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 320 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Mouse { type: 2 @@ -94,23 +94,23 @@ VisualTest { } Frame { msec: 336 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 352 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 368 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 384 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 400 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Mouse { type: 3 @@ -122,63 +122,63 @@ VisualTest { } Frame { msec: 416 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 432 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 448 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 464 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 480 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 496 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 512 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 528 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 544 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 560 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 576 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 592 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 608 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 624 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Frame { msec: 640 - hash: "e931c5f5d15e4f977e1822f2a6dd57df" + hash: "e742c08c259034e879b95eea60794e77" } Mouse { type: 2 @@ -190,11 +190,11 @@ VisualTest { } Frame { msec: 656 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 672 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Mouse { type: 3 @@ -206,71 +206,71 @@ VisualTest { } Frame { msec: 688 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 704 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 720 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 736 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 752 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 768 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 784 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 800 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 816 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 832 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 848 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 864 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 880 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 896 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 912 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 928 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 944 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 960 @@ -278,87 +278,87 @@ VisualTest { } Frame { msec: 976 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 992 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1008 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1024 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1040 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1056 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1072 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1088 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1104 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1120 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1136 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1152 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1168 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1184 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1200 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1216 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1232 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1248 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1264 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1280 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Frame { msec: 1296 - hash: "01cf9ccfc86504bc6efe5fec1e68e537" + hash: "3eaecb73d32414207c898a36c9c41da3" } Key { type: 6 @@ -370,23 +370,23 @@ VisualTest { } Frame { msec: 1312 - hash: "bac01431244974a1768d84318f49bf89" + hash: "c101a1d74691605f2740452950693e43" } Frame { msec: 1328 - hash: "bac01431244974a1768d84318f49bf89" + hash: "c101a1d74691605f2740452950693e43" } Frame { msec: 1344 - hash: "bac01431244974a1768d84318f49bf89" + hash: "c101a1d74691605f2740452950693e43" } Frame { msec: 1360 - hash: "bac01431244974a1768d84318f49bf89" + hash: "c101a1d74691605f2740452950693e43" } Frame { msec: 1376 - hash: "bac01431244974a1768d84318f49bf89" + hash: "c101a1d74691605f2740452950693e43" } Key { type: 7 @@ -398,7 +398,7 @@ VisualTest { } Frame { msec: 1392 - hash: "bac01431244974a1768d84318f49bf89" + hash: "c101a1d74691605f2740452950693e43" } Key { type: 6 @@ -410,19 +410,19 @@ VisualTest { } Frame { msec: 1408 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1424 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1440 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1456 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Key { type: 7 @@ -434,27 +434,27 @@ VisualTest { } Frame { msec: 1472 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1488 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1504 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1520 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1536 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Frame { msec: 1552 - hash: "e22c6376c05d52c8997a67bf21d82a83" + hash: "e3e33c9f73352079db2f5e96c0069974" } Key { type: 6 @@ -466,15 +466,15 @@ VisualTest { } Frame { msec: 1568 - hash: "47f630d2cc3a3fa15309f5f631a36690" + hash: "0e79208365ec4b5a609d13b9e6c5c8d8" } Frame { msec: 1584 - hash: "47f630d2cc3a3fa15309f5f631a36690" + hash: "0e79208365ec4b5a609d13b9e6c5c8d8" } Frame { msec: 1600 - hash: "47f630d2cc3a3fa15309f5f631a36690" + hash: "0e79208365ec4b5a609d13b9e6c5c8d8" } Key { type: 7 @@ -486,7 +486,7 @@ VisualTest { } Frame { msec: 1616 - hash: "47f630d2cc3a3fa15309f5f631a36690" + hash: "0e79208365ec4b5a609d13b9e6c5c8d8" } Key { type: 6 @@ -498,23 +498,23 @@ VisualTest { } Frame { msec: 1632 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Frame { msec: 1648 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Frame { msec: 1664 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Frame { msec: 1680 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Frame { msec: 1696 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Key { type: 7 @@ -526,11 +526,11 @@ VisualTest { } Frame { msec: 1712 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Frame { msec: 1728 - hash: "b03df007a2e778d3f055ceb12ab61ec1" + hash: "5485c9cf4050ef8c1dda227d27326f78" } Key { type: 6 @@ -542,15 +542,15 @@ VisualTest { } Frame { msec: 1744 - hash: "f73e5dc997ddc56554f914014c376f24" + hash: "1063a2e6164b372ba364c15c1c8b6ade" } Frame { msec: 1760 - hash: "f73e5dc997ddc56554f914014c376f24" + hash: "1063a2e6164b372ba364c15c1c8b6ade" } Frame { msec: 1776 - hash: "f73e5dc997ddc56554f914014c376f24" + hash: "1063a2e6164b372ba364c15c1c8b6ade" } Key { type: 7 @@ -562,15 +562,15 @@ VisualTest { } Frame { msec: 1792 - hash: "f73e5dc997ddc56554f914014c376f24" + hash: "1063a2e6164b372ba364c15c1c8b6ade" } Frame { msec: 1808 - hash: "f73e5dc997ddc56554f914014c376f24" + hash: "1063a2e6164b372ba364c15c1c8b6ade" } Frame { msec: 1824 - hash: "f73e5dc997ddc56554f914014c376f24" + hash: "1063a2e6164b372ba364c15c1c8b6ade" } Key { type: 6 @@ -582,23 +582,23 @@ VisualTest { } Frame { msec: 1840 - hash: "d089f840e514b68fad1edbbce686525f" + hash: "213c0057171a86bd4e2d898fac4d6642" } Frame { msec: 1856 - hash: "d089f840e514b68fad1edbbce686525f" + hash: "213c0057171a86bd4e2d898fac4d6642" } Frame { msec: 1872 - hash: "d089f840e514b68fad1edbbce686525f" + hash: "213c0057171a86bd4e2d898fac4d6642" } Frame { msec: 1888 - hash: "d089f840e514b68fad1edbbce686525f" + hash: "213c0057171a86bd4e2d898fac4d6642" } Frame { msec: 1904 - hash: "d089f840e514b68fad1edbbce686525f" + hash: "213c0057171a86bd4e2d898fac4d6642" } Key { type: 7 @@ -622,15 +622,15 @@ VisualTest { } Frame { msec: 1936 - hash: "9751cdca40cadacfc28de757b20ed639" + hash: "df9766751a5698f84f98faa0ac0e6f1a" } Frame { msec: 1952 - hash: "9751cdca40cadacfc28de757b20ed639" + hash: "df9766751a5698f84f98faa0ac0e6f1a" } Frame { msec: 1968 - hash: "9751cdca40cadacfc28de757b20ed639" + hash: "df9766751a5698f84f98faa0ac0e6f1a" } Key { type: 6 @@ -642,11 +642,11 @@ VisualTest { } Frame { msec: 1984 - hash: "8fb457eb7c17974786ff239c09101d27" + hash: "47cb63f13c81ac6557ecc68d4e6f9c99" } Frame { msec: 2000 - hash: "8fb457eb7c17974786ff239c09101d27" + hash: "47cb63f13c81ac6557ecc68d4e6f9c99" } Key { type: 7 @@ -658,7 +658,7 @@ VisualTest { } Frame { msec: 2016 - hash: "8fb457eb7c17974786ff239c09101d27" + hash: "47cb63f13c81ac6557ecc68d4e6f9c99" } Key { type: 6 @@ -670,11 +670,11 @@ VisualTest { } Frame { msec: 2032 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Frame { msec: 2048 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Key { type: 7 @@ -686,19 +686,19 @@ VisualTest { } Frame { msec: 2064 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Frame { msec: 2080 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Frame { msec: 2096 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Frame { msec: 2112 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Key { type: 7 @@ -710,11 +710,11 @@ VisualTest { } Frame { msec: 2128 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Frame { msec: 2144 - hash: "eeb022c3dd997ce86c3a60146d19b540" + hash: "4f39251d7a0071a67435d088f46fc4fe" } Key { type: 6 @@ -726,27 +726,27 @@ VisualTest { } Frame { msec: 2160 - hash: "ba2033e83b5aef2408197ebf7db543a6" + hash: "722715a78e99d0f1f9a2830090c98f3c" } Frame { msec: 2176 - hash: "ba2033e83b5aef2408197ebf7db543a6" + hash: "722715a78e99d0f1f9a2830090c98f3c" } Frame { msec: 2192 - hash: "ba2033e83b5aef2408197ebf7db543a6" + hash: "722715a78e99d0f1f9a2830090c98f3c" } Frame { msec: 2208 - hash: "ba2033e83b5aef2408197ebf7db543a6" + hash: "722715a78e99d0f1f9a2830090c98f3c" } Frame { msec: 2224 - hash: "ba2033e83b5aef2408197ebf7db543a6" + hash: "722715a78e99d0f1f9a2830090c98f3c" } Frame { msec: 2240 - hash: "ba2033e83b5aef2408197ebf7db543a6" + hash: "722715a78e99d0f1f9a2830090c98f3c" } Key { type: 7 @@ -766,23 +766,23 @@ VisualTest { } Frame { msec: 2256 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Frame { msec: 2272 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Frame { msec: 2288 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Frame { msec: 2304 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Frame { msec: 2320 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Key { type: 7 @@ -794,11 +794,11 @@ VisualTest { } Frame { msec: 2336 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Frame { msec: 2352 - hash: "8a843083f0415f1e06bfe925b3bd7f52" + hash: "aa085c20f74a765297f7904680c7591e" } Key { type: 6 @@ -810,19 +810,19 @@ VisualTest { } Frame { msec: 2368 - hash: "c3d6b261447c0fa65722c697b60ef415" + hash: "0cc1397ce700d4a84647dddee65241b3" } Frame { msec: 2384 - hash: "c3d6b261447c0fa65722c697b60ef415" + hash: "0cc1397ce700d4a84647dddee65241b3" } Frame { msec: 2400 - hash: "c3d6b261447c0fa65722c697b60ef415" + hash: "0cc1397ce700d4a84647dddee65241b3" } Frame { msec: 2416 - hash: "c3d6b261447c0fa65722c697b60ef415" + hash: "0cc1397ce700d4a84647dddee65241b3" } Key { type: 7 @@ -834,7 +834,7 @@ VisualTest { } Frame { msec: 2432 - hash: "c3d6b261447c0fa65722c697b60ef415" + hash: "0cc1397ce700d4a84647dddee65241b3" } Key { type: 6 @@ -846,27 +846,27 @@ VisualTest { } Frame { msec: 2448 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Frame { msec: 2464 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Frame { msec: 2480 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Frame { msec: 2496 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Frame { msec: 2512 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Frame { msec: 2528 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Key { type: 7 @@ -878,7 +878,7 @@ VisualTest { } Frame { msec: 2544 - hash: "7899672516311904cc7108f975290615" + hash: "ac693aa9030cc388dce9004916734aed" } Key { type: 6 @@ -890,19 +890,19 @@ VisualTest { } Frame { msec: 2560 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2576 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2592 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2608 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Key { type: 7 @@ -914,23 +914,23 @@ VisualTest { } Frame { msec: 2624 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2640 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2656 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2672 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Frame { msec: 2688 - hash: "4c9dc2d3538a47f0c5f4e5b8f1863583" + hash: "e1f1b75892dc186e7f9546661722e259" } Key { type: 6 @@ -942,27 +942,27 @@ VisualTest { } Frame { msec: 2704 - hash: "0e583b5b8c82af7fe74ff845abb57069" + hash: "4c1829c6c263cf290e0e71035f678589" } Frame { msec: 2720 - hash: "0e583b5b8c82af7fe74ff845abb57069" + hash: "4c1829c6c263cf290e0e71035f678589" } Frame { msec: 2736 - hash: "0e583b5b8c82af7fe74ff845abb57069" + hash: "4c1829c6c263cf290e0e71035f678589" } Frame { msec: 2752 - hash: "0e583b5b8c82af7fe74ff845abb57069" + hash: "4c1829c6c263cf290e0e71035f678589" } Frame { msec: 2768 - hash: "0e583b5b8c82af7fe74ff845abb57069" + hash: "4c1829c6c263cf290e0e71035f678589" } Frame { msec: 2784 - hash: "0e583b5b8c82af7fe74ff845abb57069" + hash: "4c1829c6c263cf290e0e71035f678589" } Key { type: 6 @@ -974,7 +974,7 @@ VisualTest { } Frame { msec: 2800 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Key { type: 7 @@ -986,19 +986,19 @@ VisualTest { } Frame { msec: 2816 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Frame { msec: 2832 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Frame { msec: 2848 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Frame { msec: 2864 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Key { type: 7 @@ -1014,15 +1014,15 @@ VisualTest { } Frame { msec: 2896 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Frame { msec: 2912 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Frame { msec: 2928 - hash: "5b282d8041386acfd94eab03a0d40fe8" + hash: "fa5cf022b185f178d0121b442af01c00" } Key { type: 6 @@ -1034,15 +1034,15 @@ VisualTest { } Frame { msec: 2944 - hash: "9b19fe7f4665fdbd471e22cac9d97bab" + hash: "b0748cac94695eb95774e0cdfabf47cc" } Frame { msec: 2960 - hash: "9b19fe7f4665fdbd471e22cac9d97bab" + hash: "b0748cac94695eb95774e0cdfabf47cc" } Frame { msec: 2976 - hash: "9b19fe7f4665fdbd471e22cac9d97bab" + hash: "b0748cac94695eb95774e0cdfabf47cc" } Key { type: 7 @@ -1062,19 +1062,19 @@ VisualTest { } Frame { msec: 2992 - hash: "ed57767e75c850ad9bf2d08050419c56" + hash: "b05fc4c21113146463372b1ea981e265" } Frame { msec: 3008 - hash: "ed57767e75c850ad9bf2d08050419c56" + hash: "b05fc4c21113146463372b1ea981e265" } Frame { msec: 3024 - hash: "ed57767e75c850ad9bf2d08050419c56" + hash: "b05fc4c21113146463372b1ea981e265" } Frame { msec: 3040 - hash: "ed57767e75c850ad9bf2d08050419c56" + hash: "b05fc4c21113146463372b1ea981e265" } Key { type: 7 @@ -1086,7 +1086,7 @@ VisualTest { } Frame { msec: 3056 - hash: "ed57767e75c850ad9bf2d08050419c56" + hash: "b05fc4c21113146463372b1ea981e265" } Key { type: 6 @@ -1098,15 +1098,15 @@ VisualTest { } Frame { msec: 3072 - hash: "225820f0472a6af17f56687a655b382a" + hash: "01b789845bf308fc896d53bbbfe0dd01" } Frame { msec: 3088 - hash: "225820f0472a6af17f56687a655b382a" + hash: "01b789845bf308fc896d53bbbfe0dd01" } Frame { msec: 3104 - hash: "225820f0472a6af17f56687a655b382a" + hash: "01b789845bf308fc896d53bbbfe0dd01" } Key { type: 6 @@ -1118,7 +1118,7 @@ VisualTest { } Frame { msec: 3120 - hash: "225820f0472a6af17f56687a655b382a" + hash: "01b789845bf308fc896d53bbbfe0dd01" } Key { type: 7 @@ -1130,11 +1130,11 @@ VisualTest { } Frame { msec: 3136 - hash: "225820f0472a6af17f56687a655b382a" + hash: "01b789845bf308fc896d53bbbfe0dd01" } Frame { msec: 3152 - hash: "225820f0472a6af17f56687a655b382a" + hash: "01b789845bf308fc896d53bbbfe0dd01" } Key { type: 6 @@ -1146,19 +1146,19 @@ VisualTest { } Frame { msec: 3168 - hash: "719effbf9211edc87c56cb5628a57ded" + hash: "433d805d957203918fc4a8edfc93290e" } Frame { msec: 3184 - hash: "719effbf9211edc87c56cb5628a57ded" + hash: "433d805d957203918fc4a8edfc93290e" } Frame { msec: 3200 - hash: "719effbf9211edc87c56cb5628a57ded" + hash: "433d805d957203918fc4a8edfc93290e" } Frame { msec: 3216 - hash: "719effbf9211edc87c56cb5628a57ded" + hash: "433d805d957203918fc4a8edfc93290e" } Key { type: 7 @@ -1170,7 +1170,7 @@ VisualTest { } Frame { msec: 3232 - hash: "719effbf9211edc87c56cb5628a57ded" + hash: "433d805d957203918fc4a8edfc93290e" } Key { type: 7 @@ -1190,19 +1190,19 @@ VisualTest { } Frame { msec: 3248 - hash: "5d8d2ba8c15937cc2f70414a71f87d24" + hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d" } Frame { msec: 3264 - hash: "5d8d2ba8c15937cc2f70414a71f87d24" + hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d" } Frame { msec: 3280 - hash: "5d8d2ba8c15937cc2f70414a71f87d24" + hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d" } Frame { msec: 3296 - hash: "5d8d2ba8c15937cc2f70414a71f87d24" + hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d" } Key { type: 7 @@ -1214,7 +1214,7 @@ VisualTest { } Frame { msec: 3312 - hash: "5d8d2ba8c15937cc2f70414a71f87d24" + hash: "1ebec912ac11b11d2ba7e5abdfb9ef6d" } Key { type: 6 @@ -1226,23 +1226,23 @@ VisualTest { } Frame { msec: 3328 - hash: "4df9946eb277ca403fd63a2e19535369" + hash: "b4bc12141255c91630e775fcf4935f22" } Frame { msec: 3344 - hash: "4df9946eb277ca403fd63a2e19535369" + hash: "b4bc12141255c91630e775fcf4935f22" } Frame { msec: 3360 - hash: "4df9946eb277ca403fd63a2e19535369" + hash: "b4bc12141255c91630e775fcf4935f22" } Frame { msec: 3376 - hash: "4df9946eb277ca403fd63a2e19535369" + hash: "b4bc12141255c91630e775fcf4935f22" } Frame { msec: 3392 - hash: "4df9946eb277ca403fd63a2e19535369" + hash: "b4bc12141255c91630e775fcf4935f22" } Key { type: 7 @@ -1254,7 +1254,7 @@ VisualTest { } Frame { msec: 3408 - hash: "4df9946eb277ca403fd63a2e19535369" + hash: "b4bc12141255c91630e775fcf4935f22" } Key { type: 6 @@ -1266,23 +1266,23 @@ VisualTest { } Frame { msec: 3424 - hash: "bb1bde5147f4f203f2af3787df0f0c7a" + hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52" } Frame { msec: 3440 - hash: "bb1bde5147f4f203f2af3787df0f0c7a" + hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52" } Frame { msec: 3456 - hash: "bb1bde5147f4f203f2af3787df0f0c7a" + hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52" } Frame { msec: 3472 - hash: "bb1bde5147f4f203f2af3787df0f0c7a" + hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52" } Frame { msec: 3488 - hash: "bb1bde5147f4f203f2af3787df0f0c7a" + hash: "8d83a3f76fd8b77c6dd9fdfb573d9c52" } Key { type: 7 @@ -1302,27 +1302,27 @@ VisualTest { } Frame { msec: 3504 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Frame { msec: 3520 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Frame { msec: 3536 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Frame { msec: 3552 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Frame { msec: 3568 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Frame { msec: 3584 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Key { type: 7 @@ -1334,7 +1334,7 @@ VisualTest { } Frame { msec: 3600 - hash: "60225c94dc1e1485406d8ba59737d383" + hash: "3f154d5eace7e0e688fe609d7eebe80d" } Key { type: 6 @@ -1346,19 +1346,19 @@ VisualTest { } Frame { msec: 3616 - hash: "8321580dd92a92edbf12df43259999f4" + hash: "8cecca2b1a586b7121692a8f618a1a50" } Frame { msec: 3632 - hash: "8321580dd92a92edbf12df43259999f4" + hash: "8cecca2b1a586b7121692a8f618a1a50" } Frame { msec: 3648 - hash: "8321580dd92a92edbf12df43259999f4" + hash: "8cecca2b1a586b7121692a8f618a1a50" } Frame { msec: 3664 - hash: "8321580dd92a92edbf12df43259999f4" + hash: "8cecca2b1a586b7121692a8f618a1a50" } Key { type: 6 @@ -1370,7 +1370,7 @@ VisualTest { } Frame { msec: 3680 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Key { type: 7 @@ -1382,15 +1382,15 @@ VisualTest { } Frame { msec: 3696 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3712 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3728 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Key { type: 7 @@ -1402,27 +1402,27 @@ VisualTest { } Frame { msec: 3744 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3760 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3776 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3792 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3808 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3824 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3840 @@ -1430,35 +1430,35 @@ VisualTest { } Frame { msec: 3856 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3872 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3888 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3904 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3920 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3936 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3952 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Frame { msec: 3968 - hash: "d704cc8d5bbdc8768d25372aa654925c" + hash: "90bd87209b6d26785689779641b1f506" } Key { type: 6 @@ -1470,23 +1470,23 @@ VisualTest { } Frame { msec: 3984 - hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3" + hash: "7fac93ef3184d5a844448c75b0aa8e18" } Frame { msec: 4000 - hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3" + hash: "7fac93ef3184d5a844448c75b0aa8e18" } Frame { msec: 4016 - hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3" + hash: "7fac93ef3184d5a844448c75b0aa8e18" } Frame { msec: 4032 - hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3" + hash: "7fac93ef3184d5a844448c75b0aa8e18" } Frame { msec: 4048 - hash: "5a73c6a6df5bc4808fd4ed20e44f2ea3" + hash: "7fac93ef3184d5a844448c75b0aa8e18" } Key { type: 6 @@ -1498,7 +1498,7 @@ VisualTest { } Frame { msec: 4064 - hash: "89613ce626a22573fa41191fcede3273" + hash: "591366861f9e23276042250d5b1da7f9" } Key { type: 7 @@ -1510,19 +1510,19 @@ VisualTest { } Frame { msec: 4080 - hash: "89613ce626a22573fa41191fcede3273" + hash: "591366861f9e23276042250d5b1da7f9" } Frame { msec: 4096 - hash: "89613ce626a22573fa41191fcede3273" + hash: "591366861f9e23276042250d5b1da7f9" } Frame { msec: 4112 - hash: "89613ce626a22573fa41191fcede3273" + hash: "591366861f9e23276042250d5b1da7f9" } Frame { msec: 4128 - hash: "89613ce626a22573fa41191fcede3273" + hash: "591366861f9e23276042250d5b1da7f9" } Key { type: 6 @@ -1534,11 +1534,11 @@ VisualTest { } Frame { msec: 4144 - hash: "7d9ef94b610cc7e9bcfd04bfac91ae38" + hash: "c5c33e5f4429698b1a1bc084a41d303d" } Frame { msec: 4160 - hash: "7d9ef94b610cc7e9bcfd04bfac91ae38" + hash: "c5c33e5f4429698b1a1bc084a41d303d" } Key { type: 7 @@ -1550,15 +1550,15 @@ VisualTest { } Frame { msec: 4176 - hash: "7d9ef94b610cc7e9bcfd04bfac91ae38" + hash: "c5c33e5f4429698b1a1bc084a41d303d" } Frame { msec: 4192 - hash: "7d9ef94b610cc7e9bcfd04bfac91ae38" + hash: "c5c33e5f4429698b1a1bc084a41d303d" } Frame { msec: 4208 - hash: "7d9ef94b610cc7e9bcfd04bfac91ae38" + hash: "c5c33e5f4429698b1a1bc084a41d303d" } Key { type: 6 @@ -1570,11 +1570,11 @@ VisualTest { } Frame { msec: 4224 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4240 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Key { type: 7 @@ -1586,11 +1586,11 @@ VisualTest { } Frame { msec: 4256 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4272 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Key { type: 7 @@ -1602,27 +1602,27 @@ VisualTest { } Frame { msec: 4288 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4304 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4320 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4336 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4352 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Frame { msec: 4368 - hash: "9653692fe9292ef0d0559412f68e9cf7" + hash: "36223521c9ab06661239329c14e4fabe" } Key { type: 6 @@ -1634,23 +1634,23 @@ VisualTest { } Frame { msec: 4384 - hash: "902831b5d2a134629e04b53c87cdc709" + hash: "22ab171b9805302b729afd314e55a0f4" } Frame { msec: 4400 - hash: "902831b5d2a134629e04b53c87cdc709" + hash: "22ab171b9805302b729afd314e55a0f4" } Frame { msec: 4416 - hash: "902831b5d2a134629e04b53c87cdc709" + hash: "22ab171b9805302b729afd314e55a0f4" } Frame { msec: 4432 - hash: "902831b5d2a134629e04b53c87cdc709" + hash: "22ab171b9805302b729afd314e55a0f4" } Frame { msec: 4448 - hash: "902831b5d2a134629e04b53c87cdc709" + hash: "22ab171b9805302b729afd314e55a0f4" } Key { type: 7 @@ -1662,7 +1662,7 @@ VisualTest { } Frame { msec: 4464 - hash: "902831b5d2a134629e04b53c87cdc709" + hash: "22ab171b9805302b729afd314e55a0f4" } Key { type: 6 @@ -1674,23 +1674,23 @@ VisualTest { } Frame { msec: 4480 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4496 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4512 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4528 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4544 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Key { type: 7 @@ -1702,15 +1702,15 @@ VisualTest { } Frame { msec: 4560 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4576 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4592 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Key { type: 6 @@ -1722,51 +1722,51 @@ VisualTest { } Frame { msec: 4608 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4624 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4640 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4656 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4672 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4688 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4704 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4720 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4736 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4752 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4768 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4784 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4800 @@ -1774,11 +1774,11 @@ VisualTest { } Frame { msec: 4816 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Frame { msec: 4832 - hash: "cc1dc01f123309c70743535f61b18278" + hash: "beaad223234484e21f824ceb7f1edc2a" } Key { type: 6 @@ -1790,31 +1790,31 @@ VisualTest { } Frame { msec: 4848 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4864 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4880 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4896 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4912 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4928 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4944 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Key { type: 7 @@ -1826,19 +1826,19 @@ VisualTest { } Frame { msec: 4960 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4976 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 4992 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5008 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Key { type: 7 @@ -1850,187 +1850,187 @@ VisualTest { } Frame { msec: 5024 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5040 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5056 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5072 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5088 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5104 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5120 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5136 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5152 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5168 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5184 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5200 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5216 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5232 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5248 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5264 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5280 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5296 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5312 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5328 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5344 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5360 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5376 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5392 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5408 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5424 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5440 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5456 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5472 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5488 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5504 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5520 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5536 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5552 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5568 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5584 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5600 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5616 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5632 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5648 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5664 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5680 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5696 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5712 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5728 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5744 - hash: "652b66d0b62e7fcf9d4fff50296966b0" + hash: "49b26f36a10d808fdcb8248a384a4da6" } Frame { msec: 5760 @@ -2046,19 +2046,19 @@ VisualTest { } Frame { msec: 5776 - hash: "a8710131aa2cfcedeb1956319174bd44" + hash: "476040951352f144bda4ed7fb817cd7f" } Frame { msec: 5792 - hash: "a8710131aa2cfcedeb1956319174bd44" + hash: "476040951352f144bda4ed7fb817cd7f" } Frame { msec: 5808 - hash: "a8710131aa2cfcedeb1956319174bd44" + hash: "476040951352f144bda4ed7fb817cd7f" } Frame { msec: 5824 - hash: "a8710131aa2cfcedeb1956319174bd44" + hash: "476040951352f144bda4ed7fb817cd7f" } Mouse { type: 5 @@ -2078,7 +2078,7 @@ VisualTest { } Frame { msec: 5840 - hash: "a8710131aa2cfcedeb1956319174bd44" + hash: "476040951352f144bda4ed7fb817cd7f" } Mouse { type: 5 @@ -2098,7 +2098,7 @@ VisualTest { } Frame { msec: 5856 - hash: "069e40e23640f303e24f8821907bf907" + hash: "9ecb1e68ab724c6f83b1a37aa1cb15c4" } Mouse { type: 5 @@ -2118,7 +2118,7 @@ VisualTest { } Frame { msec: 5872 - hash: "069e40e23640f303e24f8821907bf907" + hash: "9ecb1e68ab724c6f83b1a37aa1cb15c4" } Mouse { type: 5 @@ -2138,7 +2138,7 @@ VisualTest { } Frame { msec: 5888 - hash: "3aba0fbccdbbbfc6b452464a35941f01" + hash: "9ecb1e68ab724c6f83b1a37aa1cb15c4" } Mouse { type: 5 @@ -2158,7 +2158,7 @@ VisualTest { } Frame { msec: 5904 - hash: "8d68c5797a7a3be6ab1bc83a1adea983" + hash: "173735fb4be11da603fb8ae8cffc609d" } Mouse { type: 5 @@ -2178,7 +2178,7 @@ VisualTest { } Frame { msec: 5920 - hash: "633201d777634e5a2e4ccc0ba7a84ada" + hash: "173735fb4be11da603fb8ae8cffc609d" } Mouse { type: 5 @@ -2198,7 +2198,7 @@ VisualTest { } Frame { msec: 5936 - hash: "e1d36d4dbdff47e6b6f864dae077bc7f" + hash: "b337a09f359fb2a237731c66ab95c92c" } Mouse { type: 5 @@ -2218,7 +2218,7 @@ VisualTest { } Frame { msec: 5952 - hash: "905419e116b2c93145c85456e6e7ccac" + hash: "32719becb40f8c6bd49b5f5754786913" } Mouse { type: 5 @@ -2238,7 +2238,7 @@ VisualTest { } Frame { msec: 5968 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2250,7 +2250,7 @@ VisualTest { } Frame { msec: 5984 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2270,7 +2270,7 @@ VisualTest { } Frame { msec: 6000 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2290,7 +2290,7 @@ VisualTest { } Frame { msec: 6016 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2310,7 +2310,7 @@ VisualTest { } Frame { msec: 6032 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2330,7 +2330,7 @@ VisualTest { } Frame { msec: 6048 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2350,7 +2350,7 @@ VisualTest { } Frame { msec: 6064 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2370,7 +2370,7 @@ VisualTest { } Frame { msec: 6080 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2390,7 +2390,7 @@ VisualTest { } Frame { msec: 6096 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2410,7 +2410,7 @@ VisualTest { } Frame { msec: 6112 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2430,7 +2430,7 @@ VisualTest { } Frame { msec: 6128 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2450,7 +2450,7 @@ VisualTest { } Frame { msec: 6144 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2470,7 +2470,7 @@ VisualTest { } Frame { msec: 6160 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2490,7 +2490,7 @@ VisualTest { } Frame { msec: 6176 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2502,23 +2502,23 @@ VisualTest { } Frame { msec: 6192 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Frame { msec: 6208 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Frame { msec: 6224 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Frame { msec: 6240 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Frame { msec: 6256 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2530,7 +2530,7 @@ VisualTest { } Frame { msec: 6272 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2550,7 +2550,7 @@ VisualTest { } Frame { msec: 6288 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2570,7 +2570,7 @@ VisualTest { } Frame { msec: 6304 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2590,7 +2590,7 @@ VisualTest { } Frame { msec: 6320 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2610,7 +2610,7 @@ VisualTest { } Frame { msec: 6336 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2630,7 +2630,7 @@ VisualTest { } Frame { msec: 6352 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2650,7 +2650,7 @@ VisualTest { } Frame { msec: 6368 - hash: "f851ebbbab70e4f283caefc26f304946" + hash: "e6bff88d0a5e2e7df4b3355749ecc902" } Mouse { type: 5 @@ -2670,7 +2670,7 @@ VisualTest { } Frame { msec: 6384 - hash: "ca385b53209d35e0c78e8124c782d03f" + hash: "5de7bbfdf96d84c8fbe74b4817a3c88a" } Mouse { type: 5 @@ -2682,7 +2682,7 @@ VisualTest { } Frame { msec: 6400 - hash: "ca385b53209d35e0c78e8124c782d03f" + hash: "5de7bbfdf96d84c8fbe74b4817a3c88a" } Mouse { type: 5 @@ -2702,7 +2702,7 @@ VisualTest { } Frame { msec: 6416 - hash: "730fa19a0deb6e210ee7ca136ecfb4e0" + hash: "056d22660f6feedfb453755978aa4c1d" } Mouse { type: 5 @@ -2722,7 +2722,7 @@ VisualTest { } Frame { msec: 6432 - hash: "e749a531bb6b30611bed794e2630555f" + hash: "9d8568931fdca572dd31ea62ebbaf76a" } Mouse { type: 5 @@ -2742,7 +2742,7 @@ VisualTest { } Frame { msec: 6448 - hash: "4d7a02eeb0d0ed7eb29fbfb72bce9ba1" + hash: "29aa2da8a830d5605a8d2d2543097177" } Mouse { type: 5 @@ -2754,7 +2754,7 @@ VisualTest { } Frame { msec: 6464 - hash: "2476a4d7038b9f1c50557cf077ea4412" + hash: "154e312998b32cc09daf1693d07eda2f" } Mouse { type: 5 @@ -2774,7 +2774,7 @@ VisualTest { } Frame { msec: 6480 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2794,7 +2794,7 @@ VisualTest { } Frame { msec: 6496 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2814,7 +2814,7 @@ VisualTest { } Frame { msec: 6512 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2834,7 +2834,7 @@ VisualTest { } Frame { msec: 6528 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2854,7 +2854,7 @@ VisualTest { } Frame { msec: 6544 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2874,7 +2874,7 @@ VisualTest { } Frame { msec: 6560 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2894,7 +2894,7 @@ VisualTest { } Frame { msec: 6576 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2914,27 +2914,27 @@ VisualTest { } Frame { msec: 6592 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Frame { msec: 6608 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Frame { msec: 6624 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Frame { msec: 6640 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Frame { msec: 6656 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Frame { msec: 6672 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2954,7 +2954,7 @@ VisualTest { } Frame { msec: 6688 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -2974,7 +2974,7 @@ VisualTest { } Frame { msec: 6704 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3014,7 +3014,7 @@ VisualTest { } Frame { msec: 6736 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3034,7 +3034,7 @@ VisualTest { } Frame { msec: 6752 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3054,7 +3054,7 @@ VisualTest { } Frame { msec: 6768 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3074,7 +3074,7 @@ VisualTest { } Frame { msec: 6784 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3094,7 +3094,7 @@ VisualTest { } Frame { msec: 6800 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3114,7 +3114,7 @@ VisualTest { } Frame { msec: 6816 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3134,7 +3134,7 @@ VisualTest { } Frame { msec: 6832 - hash: "ff9bdea73a03bc51f76b6732176a0bad" + hash: "5b3a17fd92fe5117aa405d4c737e6673" } Mouse { type: 5 @@ -3154,7 +3154,7 @@ VisualTest { } Frame { msec: 6848 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "476040951352f144bda4ed7fb817cd7f" } Mouse { type: 5 @@ -3174,7 +3174,7 @@ VisualTest { } Frame { msec: 6864 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Mouse { type: 5 @@ -3194,7 +3194,7 @@ VisualTest { } Frame { msec: 6880 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Mouse { type: 3 @@ -3206,55 +3206,55 @@ VisualTest { } Frame { msec: 6896 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 6912 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 6928 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 6944 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 6960 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 6976 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 6992 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 7008 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 7024 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 7040 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 7056 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 7072 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Frame { msec: 7088 - hash: "2b0458102c2231777202e66e0eaa8c8c" + hash: "2cb10cb75beb454df7918b6948c6ad8a" } Mouse { type: 2 @@ -3266,23 +3266,23 @@ VisualTest { } Frame { msec: 7104 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7120 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7136 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7152 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7168 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Mouse { type: 3 @@ -3294,103 +3294,103 @@ VisualTest { } Frame { msec: 7184 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7200 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7216 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7232 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7248 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7264 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7280 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7296 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7312 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7328 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7344 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7360 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7376 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7392 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7408 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7424 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7440 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7456 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7472 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7488 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7504 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7520 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7536 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7552 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Frame { msec: 7568 - hash: "2ca3f2d1e4673bd97d05b43c4b70174a" + hash: "eafa794e0c09cc2558575bafa945ecdf" } Key { type: 6 @@ -3402,15 +3402,15 @@ VisualTest { } Frame { msec: 7584 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Frame { msec: 7600 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Frame { msec: 7616 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Key { type: 7 @@ -3422,15 +3422,15 @@ VisualTest { } Frame { msec: 7632 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Frame { msec: 7648 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Frame { msec: 7664 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Frame { msec: 7680 @@ -3438,11 +3438,11 @@ VisualTest { } Frame { msec: 7696 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Frame { msec: 7712 - hash: "ed7e9042cc805a60b1e8cf58a654ac66" + hash: "0444d714b801f88685df9722390faf4f" } Key { type: 6 @@ -3454,63 +3454,63 @@ VisualTest { } Frame { msec: 7728 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7744 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7760 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7776 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7792 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7808 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7824 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7840 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7856 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7872 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7888 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7904 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7920 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7936 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Frame { msec: 7952 - hash: "16829fffc675d304661b9ff844a675f3" + hash: "250a49b60ad8e9b901977e01063ec20a" } Key { type: 7 @@ -3530,11 +3530,11 @@ VisualTest { } Frame { msec: 7968 - hash: "45cfab0823b20b5dc206b42781cd9fb0" + hash: "bec2aea61fef64475e638848b96d28c3" } Frame { msec: 7984 - hash: "45cfab0823b20b5dc206b42781cd9fb0" + hash: "bec2aea61fef64475e638848b96d28c3" } Key { type: 7 @@ -3554,11 +3554,11 @@ VisualTest { } Frame { msec: 8000 - hash: "01069fb12c399f4d22d4d4ec79779752" + hash: "54177e0d53373636850e18399640fee8" } Frame { msec: 8016 - hash: "01069fb12c399f4d22d4d4ec79779752" + hash: "54177e0d53373636850e18399640fee8" } Key { type: 7 @@ -3578,11 +3578,11 @@ VisualTest { } Frame { msec: 8032 - hash: "88b6c6cca32a6d4adfc51cc7cce5e4bb" + hash: "81c03bd9dfd562e9f13784c906fa0d9e" } Frame { msec: 8048 - hash: "88b6c6cca32a6d4adfc51cc7cce5e4bb" + hash: "81c03bd9dfd562e9f13784c906fa0d9e" } Key { type: 7 @@ -3602,11 +3602,11 @@ VisualTest { } Frame { msec: 8064 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8080 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Key { type: 6 @@ -3626,31 +3626,31 @@ VisualTest { } Frame { msec: 8096 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8112 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8128 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8144 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8160 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8176 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Frame { msec: 8192 - hash: "7b8423cfd0806b7d29cdb366133ef828" + hash: "2547fbe956bab6566c2b9137c0edc841" } Key { type: 6 @@ -3662,19 +3662,19 @@ VisualTest { } Frame { msec: 8208 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Frame { msec: 8224 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Frame { msec: 8240 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Frame { msec: 8256 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Key { type: 7 @@ -3686,19 +3686,19 @@ VisualTest { } Frame { msec: 8272 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Frame { msec: 8288 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Frame { msec: 8304 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Frame { msec: 8320 - hash: "45feb9f7c516693224505726324e07f1" + hash: "c757d4e60d18ce16f87c66e42cc81a99" } Key { type: 6 @@ -3710,19 +3710,19 @@ VisualTest { } Frame { msec: 8336 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8352 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8368 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8384 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Key { type: 7 @@ -3734,23 +3734,23 @@ VisualTest { } Frame { msec: 8400 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8416 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8432 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8448 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Frame { msec: 8464 - hash: "592811b385809e02c02e5925191fbc0c" + hash: "2ef578193024153dc85a2a92d10dc6c0" } Key { type: 6 @@ -3762,19 +3762,19 @@ VisualTest { } Frame { msec: 8480 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8496 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8512 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8528 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Key { type: 7 @@ -3786,27 +3786,27 @@ VisualTest { } Frame { msec: 8544 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8560 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8576 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8592 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8608 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8624 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8640 @@ -3814,7 +3814,7 @@ VisualTest { } Frame { msec: 8656 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Key { type: 7 @@ -3826,139 +3826,139 @@ VisualTest { } Frame { msec: 8672 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8688 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8704 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8720 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8736 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8752 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8768 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8784 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8800 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8816 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8832 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8848 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8864 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8880 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8896 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8912 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8928 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8944 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8960 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8976 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 8992 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9008 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9024 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9040 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9056 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9072 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9088 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9104 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9120 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9136 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9152 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9168 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9184 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9200 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Mouse { type: 2 @@ -3970,11 +3970,11 @@ VisualTest { } Frame { msec: 9216 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9232 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Mouse { type: 5 @@ -3986,7 +3986,7 @@ VisualTest { } Frame { msec: 9248 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Mouse { type: 5 @@ -4006,7 +4006,7 @@ VisualTest { } Frame { msec: 9264 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Mouse { type: 5 @@ -4026,7 +4026,7 @@ VisualTest { } Frame { msec: 9280 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Mouse { type: 3 @@ -4038,43 +4038,43 @@ VisualTest { } Frame { msec: 9296 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9312 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9328 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9344 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9360 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9376 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9392 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9408 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9424 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Frame { msec: 9440 - hash: "e9b5feff425d22a5dcecc57ebb3d5379" + hash: "47e926162c6d695d2bdb7ec9de05f0cc" } Mouse { type: 2 @@ -4086,27 +4086,27 @@ VisualTest { } Frame { msec: 9456 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9472 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9488 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9504 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9520 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9536 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Mouse { type: 3 @@ -4118,15 +4118,15 @@ VisualTest { } Frame { msec: 9552 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9568 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9584 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9600 @@ -4134,19 +4134,19 @@ VisualTest { } Frame { msec: 9616 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9632 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9648 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9664 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Key { type: 6 @@ -4158,111 +4158,111 @@ VisualTest { } Frame { msec: 9680 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9696 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9712 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9728 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9744 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9760 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9776 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9792 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9808 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9824 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9840 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9856 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9872 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9888 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9904 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9920 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9936 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9952 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9968 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 9984 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10000 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10016 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10032 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10048 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10064 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10080 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10096 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Key { type: 6 @@ -4274,35 +4274,35 @@ VisualTest { } Frame { msec: 10112 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10128 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10144 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10160 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10176 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10192 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10208 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10224 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Key { type: 7 @@ -4314,35 +4314,35 @@ VisualTest { } Frame { msec: 10240 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10256 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10272 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10288 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10304 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10320 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10336 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Frame { msec: 10352 - hash: "f3e8f8174b1c995d76e68fea7f21f285" + hash: "2ef5e7b2c0edc631765ea12d1f7abf33" } Key { type: 6 @@ -4354,27 +4354,27 @@ VisualTest { } Frame { msec: 10368 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10384 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10400 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10416 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10432 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10448 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Key { type: 7 @@ -4386,27 +4386,27 @@ VisualTest { } Frame { msec: 10464 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10480 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10496 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10512 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10528 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10544 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10560 @@ -4414,23 +4414,23 @@ VisualTest { } Frame { msec: 10576 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10592 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10608 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10624 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10640 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Key { type: 7 @@ -4442,219 +4442,219 @@ VisualTest { } Frame { msec: 10656 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10672 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10688 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10704 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10720 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10736 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10752 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10768 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10784 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10800 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10816 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10832 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10848 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10864 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10880 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10896 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10912 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10928 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10944 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10960 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10976 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 10992 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11008 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11024 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11040 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11056 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11072 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11088 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11104 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11120 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11136 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11152 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11168 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11184 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11200 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11216 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11232 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11248 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11264 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11280 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11296 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11312 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11328 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11344 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11360 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11376 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11392 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11408 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11424 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11440 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11456 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11472 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11488 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11504 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11520 @@ -4662,26 +4662,26 @@ VisualTest { } Frame { msec: 11536 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11552 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11568 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11584 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11600 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } Frame { msec: 11616 - hash: "94c707f2778a4f327f0c49265a42dfb4" + hash: "c3914ed0d035a39423a1f2cf9ac6c165" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png Binary files differindex 0d1fa54..61606b2 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png Binary files differindex bedf721..a4b28fc 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png Binary files differindex f17abe2..5be6bbb 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png Binary files differindex a98e8ef..a220f65 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png Binary files differindex 36801d8..6946707 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png Binary files differindex 35c39e7..4eeb8ec 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png Binary files differindex 35c39e7..4eeb8ec 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml index 3e36073..f1bb5a9 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.qml @@ -6,7 +6,7 @@ VisualTest { } Frame { msec: 16 - hash: "2bfc2ce5462c1b2e8177159590e8bf9d" + hash: "b6611676a7d38162d5c0210ea9d0e291" } Key { type: 6 @@ -18,7 +18,7 @@ VisualTest { } Frame { msec: 32 - hash: "2aebd6f552933d74ad64e953728c44a6" + hash: "b7fc43d4344c8d39f4240dadead86b1e" } Key { type: 7 @@ -30,11 +30,11 @@ VisualTest { } Frame { msec: 48 - hash: "2aebd6f552933d74ad64e953728c44a6" + hash: "b7fc43d4344c8d39f4240dadead86b1e" } Frame { msec: 64 - hash: "2aebd6f552933d74ad64e953728c44a6" + hash: "b7fc43d4344c8d39f4240dadead86b1e" } Key { type: 7 @@ -46,11 +46,11 @@ VisualTest { } Frame { msec: 80 - hash: "2aebd6f552933d74ad64e953728c44a6" + hash: "b7fc43d4344c8d39f4240dadead86b1e" } Frame { msec: 96 - hash: "2aebd6f552933d74ad64e953728c44a6" + hash: "b7fc43d4344c8d39f4240dadead86b1e" } Key { type: 6 @@ -62,15 +62,15 @@ VisualTest { } Frame { msec: 112 - hash: "96f0f1c8ddc760ddb454c374faa75239" + hash: "23006a07263b8b3240c4080fb1d587e9" } Frame { msec: 128 - hash: "96f0f1c8ddc760ddb454c374faa75239" + hash: "23006a07263b8b3240c4080fb1d587e9" } Frame { msec: 144 - hash: "96f0f1c8ddc760ddb454c374faa75239" + hash: "23006a07263b8b3240c4080fb1d587e9" } Key { type: 6 @@ -82,15 +82,15 @@ VisualTest { } Frame { msec: 160 - hash: "5660942e66cdc499a067b1209b46a593" + hash: "8a60fd38fb9c171a15bf7e6e51bee664" } Frame { msec: 176 - hash: "5660942e66cdc499a067b1209b46a593" + hash: "8a60fd38fb9c171a15bf7e6e51bee664" } Frame { msec: 192 - hash: "5660942e66cdc499a067b1209b46a593" + hash: "8a60fd38fb9c171a15bf7e6e51bee664" } Key { type: 7 @@ -102,11 +102,11 @@ VisualTest { } Frame { msec: 208 - hash: "5660942e66cdc499a067b1209b46a593" + hash: "8a60fd38fb9c171a15bf7e6e51bee664" } Frame { msec: 224 - hash: "5660942e66cdc499a067b1209b46a593" + hash: "8a60fd38fb9c171a15bf7e6e51bee664" } Key { type: 6 @@ -118,7 +118,7 @@ VisualTest { } Frame { msec: 240 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Key { type: 7 @@ -130,19 +130,19 @@ VisualTest { } Frame { msec: 256 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Frame { msec: 272 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Frame { msec: 288 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Frame { msec: 304 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Key { type: 7 @@ -154,11 +154,11 @@ VisualTest { } Frame { msec: 320 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Frame { msec: 336 - hash: "dd3b01d6a2a829e6ba7404d5318f7d15" + hash: "33cdfa214f071848ed374407b4601c5a" } Key { type: 6 @@ -170,19 +170,19 @@ VisualTest { } Frame { msec: 352 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Frame { msec: 368 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Frame { msec: 384 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Frame { msec: 400 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Key { type: 7 @@ -194,19 +194,19 @@ VisualTest { } Frame { msec: 416 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Frame { msec: 432 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Frame { msec: 448 - hash: "1cf8dbc4358e3aa51c260a3a40143318" + hash: "80794c72fe7dda72997122a89f33e6e4" } Frame { msec: 464 - hash: "c9f5b9e45b0bb040e669daccf8bb1eb0" + hash: "80794c72fe7dda72997122a89f33e6e4" } Key { type: 6 @@ -218,19 +218,19 @@ VisualTest { } Frame { msec: 480 - hash: "fc2972eca4ca510d23c92f712fd1ceb3" + hash: "bfcd901aee3d9db796597834bec1f173" } Frame { msec: 496 - hash: "fc2972eca4ca510d23c92f712fd1ceb3" + hash: "bfcd901aee3d9db796597834bec1f173" } Frame { msec: 512 - hash: "fc2972eca4ca510d23c92f712fd1ceb3" + hash: "bfcd901aee3d9db796597834bec1f173" } Frame { msec: 528 - hash: "fc2972eca4ca510d23c92f712fd1ceb3" + hash: "bfcd901aee3d9db796597834bec1f173" } Key { type: 6 @@ -250,23 +250,23 @@ VisualTest { } Frame { msec: 544 - hash: "15313caf999d43a079e51c69323682f3" + hash: "965102cb74dcf695b950616ce5c42875" } Frame { msec: 560 - hash: "15313caf999d43a079e51c69323682f3" + hash: "965102cb74dcf695b950616ce5c42875" } Frame { msec: 576 - hash: "15313caf999d43a079e51c69323682f3" + hash: "965102cb74dcf695b950616ce5c42875" } Frame { msec: 592 - hash: "15313caf999d43a079e51c69323682f3" + hash: "965102cb74dcf695b950616ce5c42875" } Frame { msec: 608 - hash: "15313caf999d43a079e51c69323682f3" + hash: "965102cb74dcf695b950616ce5c42875" } Key { type: 7 @@ -286,19 +286,19 @@ VisualTest { } Frame { msec: 624 - hash: "80cbbe525c033083248e4a5d636f875c" + hash: "73556f0cf2c8d77881a7d3881025e343" } Frame { msec: 640 - hash: "80cbbe525c033083248e4a5d636f875c" + hash: "73556f0cf2c8d77881a7d3881025e343" } Frame { msec: 656 - hash: "80cbbe525c033083248e4a5d636f875c" + hash: "73556f0cf2c8d77881a7d3881025e343" } Frame { msec: 672 - hash: "80cbbe525c033083248e4a5d636f875c" + hash: "73556f0cf2c8d77881a7d3881025e343" } Key { type: 7 @@ -310,11 +310,11 @@ VisualTest { } Frame { msec: 688 - hash: "80cbbe525c033083248e4a5d636f875c" + hash: "73556f0cf2c8d77881a7d3881025e343" } Frame { msec: 704 - hash: "80cbbe525c033083248e4a5d636f875c" + hash: "73556f0cf2c8d77881a7d3881025e343" } Key { type: 6 @@ -326,23 +326,23 @@ VisualTest { } Frame { msec: 720 - hash: "ccc8cfb1c79d043ec68b2174f3fb5b27" + hash: "a75bdb09a48b90936d2d4de647e7323d" } Frame { msec: 736 - hash: "ccc8cfb1c79d043ec68b2174f3fb5b27" + hash: "a75bdb09a48b90936d2d4de647e7323d" } Frame { msec: 752 - hash: "ccc8cfb1c79d043ec68b2174f3fb5b27" + hash: "a75bdb09a48b90936d2d4de647e7323d" } Frame { msec: 768 - hash: "ccc8cfb1c79d043ec68b2174f3fb5b27" + hash: "a75bdb09a48b90936d2d4de647e7323d" } Frame { msec: 784 - hash: "ccc8cfb1c79d043ec68b2174f3fb5b27" + hash: "a75bdb09a48b90936d2d4de647e7323d" } Key { type: 7 @@ -354,7 +354,7 @@ VisualTest { } Frame { msec: 800 - hash: "ccc8cfb1c79d043ec68b2174f3fb5b27" + hash: "a75bdb09a48b90936d2d4de647e7323d" } Key { type: 6 @@ -366,15 +366,15 @@ VisualTest { } Frame { msec: 816 - hash: "d13548c95a838350f2b3011e643e0182" + hash: "f37ab5f03e7cf86e3589fc0711b23a53" } Frame { msec: 832 - hash: "d13548c95a838350f2b3011e643e0182" + hash: "f37ab5f03e7cf86e3589fc0711b23a53" } Frame { msec: 848 - hash: "d13548c95a838350f2b3011e643e0182" + hash: "f37ab5f03e7cf86e3589fc0711b23a53" } Key { type: 7 @@ -386,15 +386,15 @@ VisualTest { } Frame { msec: 864 - hash: "d13548c95a838350f2b3011e643e0182" + hash: "f37ab5f03e7cf86e3589fc0711b23a53" } Frame { msec: 880 - hash: "d13548c95a838350f2b3011e643e0182" + hash: "f37ab5f03e7cf86e3589fc0711b23a53" } Frame { msec: 896 - hash: "d13548c95a838350f2b3011e643e0182" + hash: "f37ab5f03e7cf86e3589fc0711b23a53" } Key { type: 6 @@ -406,15 +406,15 @@ VisualTest { } Frame { msec: 912 - hash: "1c61611fc6386736782b7d61619ae9af" + hash: "219e5edd5f138cd113f0b929460cf074" } Frame { msec: 928 - hash: "1c61611fc6386736782b7d61619ae9af" + hash: "219e5edd5f138cd113f0b929460cf074" } Frame { msec: 944 - hash: "1c61611fc6386736782b7d61619ae9af" + hash: "219e5edd5f138cd113f0b929460cf074" } Frame { msec: 960 @@ -422,11 +422,11 @@ VisualTest { } Frame { msec: 976 - hash: "224079eaeb708f8cd27326a06857f6aa" + hash: "219e5edd5f138cd113f0b929460cf074" } Frame { msec: 992 - hash: "224079eaeb708f8cd27326a06857f6aa" + hash: "219e5edd5f138cd113f0b929460cf074" } Key { type: 6 @@ -446,23 +446,23 @@ VisualTest { } Frame { msec: 1008 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1024 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1040 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1056 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1072 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Key { type: 7 @@ -474,31 +474,31 @@ VisualTest { } Frame { msec: 1088 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1104 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1120 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1136 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1152 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1168 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Frame { msec: 1184 - hash: "07681c5879322e7ac093c9324b45520d" + hash: "79cf23a46fbbeddbef10ef2a62533342" } Key { type: 6 @@ -510,23 +510,23 @@ VisualTest { } Frame { msec: 1200 - hash: "9dda4b5fa581a01608d9c3e2ce0bc33b" + hash: "ccb17209d85c7e49fbb0b5f9134fc39c" } Frame { msec: 1216 - hash: "9dda4b5fa581a01608d9c3e2ce0bc33b" + hash: "ccb17209d85c7e49fbb0b5f9134fc39c" } Frame { msec: 1232 - hash: "9dda4b5fa581a01608d9c3e2ce0bc33b" + hash: "ccb17209d85c7e49fbb0b5f9134fc39c" } Frame { msec: 1248 - hash: "9dda4b5fa581a01608d9c3e2ce0bc33b" + hash: "ccb17209d85c7e49fbb0b5f9134fc39c" } Frame { msec: 1264 - hash: "9dda4b5fa581a01608d9c3e2ce0bc33b" + hash: "ccb17209d85c7e49fbb0b5f9134fc39c" } Key { type: 7 @@ -546,11 +546,11 @@ VisualTest { } Frame { msec: 1280 - hash: "95c62fa8d99d29999ce84b975d6858bc" + hash: "29aaa213e4b146199289b5383528bc88" } Frame { msec: 1296 - hash: "95c62fa8d99d29999ce84b975d6858bc" + hash: "29aaa213e4b146199289b5383528bc88" } Key { type: 6 @@ -562,15 +562,15 @@ VisualTest { } Frame { msec: 1312 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Frame { msec: 1328 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Frame { msec: 1344 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Key { type: 7 @@ -582,11 +582,11 @@ VisualTest { } Frame { msec: 1360 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Frame { msec: 1376 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Key { type: 7 @@ -598,19 +598,19 @@ VisualTest { } Frame { msec: 1392 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Frame { msec: 1408 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Frame { msec: 1424 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Frame { msec: 1440 - hash: "c98dada1c82e867bd0d0ff56de86574f" + hash: "7f9da386497bca2dc19b1c3ab475f453" } Key { type: 6 @@ -622,23 +622,23 @@ VisualTest { } Frame { msec: 1456 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Frame { msec: 1472 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Frame { msec: 1488 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Frame { msec: 1504 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Frame { msec: 1520 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Key { type: 7 @@ -650,11 +650,11 @@ VisualTest { } Frame { msec: 1536 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Frame { msec: 1552 - hash: "30d8ac1ed88cce3df5e8e5ef209caf45" + hash: "eb683a6b2a9ed2cf4ea5cb424670c9d2" } Key { type: 6 @@ -666,23 +666,23 @@ VisualTest { } Frame { msec: 1568 - hash: "d0d0bd91c9ac756c43a0c0fe53797ee3" + hash: "c5c789ca287cf673be808f3e10e054a2" } Frame { msec: 1584 - hash: "d0d0bd91c9ac756c43a0c0fe53797ee3" + hash: "c5c789ca287cf673be808f3e10e054a2" } Frame { msec: 1600 - hash: "d0d0bd91c9ac756c43a0c0fe53797ee3" + hash: "c5c789ca287cf673be808f3e10e054a2" } Frame { msec: 1616 - hash: "d0d0bd91c9ac756c43a0c0fe53797ee3" + hash: "c5c789ca287cf673be808f3e10e054a2" } Frame { msec: 1632 - hash: "d0d0bd91c9ac756c43a0c0fe53797ee3" + hash: "c5c789ca287cf673be808f3e10e054a2" } Key { type: 6 @@ -702,23 +702,23 @@ VisualTest { } Frame { msec: 1648 - hash: "8a2825dc4d2883fe491819ae34a2eff8" + hash: "5e39fc7058b64afa7036002a2dae8976" } Frame { msec: 1664 - hash: "8a2825dc4d2883fe491819ae34a2eff8" + hash: "5e39fc7058b64afa7036002a2dae8976" } Frame { msec: 1680 - hash: "8a2825dc4d2883fe491819ae34a2eff8" + hash: "5e39fc7058b64afa7036002a2dae8976" } Frame { msec: 1696 - hash: "8a2825dc4d2883fe491819ae34a2eff8" + hash: "5e39fc7058b64afa7036002a2dae8976" } Frame { msec: 1712 - hash: "8a2825dc4d2883fe491819ae34a2eff8" + hash: "5e39fc7058b64afa7036002a2dae8976" } Key { type: 6 @@ -730,15 +730,15 @@ VisualTest { } Frame { msec: 1728 - hash: "acf73c003e786ca1756f43a2e20962d3" + hash: "687e69083430812cd42eff708229a176" } Frame { msec: 1744 - hash: "acf73c003e786ca1756f43a2e20962d3" + hash: "687e69083430812cd42eff708229a176" } Frame { msec: 1760 - hash: "acf73c003e786ca1756f43a2e20962d3" + hash: "687e69083430812cd42eff708229a176" } Key { type: 7 @@ -750,7 +750,7 @@ VisualTest { } Frame { msec: 1776 - hash: "acf73c003e786ca1756f43a2e20962d3" + hash: "687e69083430812cd42eff708229a176" } Key { type: 6 @@ -762,11 +762,11 @@ VisualTest { } Frame { msec: 1792 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1808 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Key { type: 7 @@ -778,19 +778,19 @@ VisualTest { } Frame { msec: 1824 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1840 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1856 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1872 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Key { type: 7 @@ -802,11 +802,11 @@ VisualTest { } Frame { msec: 1888 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1904 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1920 @@ -814,11 +814,11 @@ VisualTest { } Frame { msec: 1936 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Frame { msec: 1952 - hash: "715cce5efb512e76e65b6dd53de988c6" + hash: "f33cd379acd2785298aa74f78e22bdfb" } Key { type: 6 @@ -830,27 +830,27 @@ VisualTest { } Frame { msec: 1968 - hash: "eb9217410ea88877b037c9f8d38413ab" + hash: "205e79eb4a7e515ffa5bd24677408e79" } Frame { msec: 1984 - hash: "eb9217410ea88877b037c9f8d38413ab" + hash: "205e79eb4a7e515ffa5bd24677408e79" } Frame { msec: 2000 - hash: "eb9217410ea88877b037c9f8d38413ab" + hash: "205e79eb4a7e515ffa5bd24677408e79" } Frame { msec: 2016 - hash: "eb9217410ea88877b037c9f8d38413ab" + hash: "205e79eb4a7e515ffa5bd24677408e79" } Frame { msec: 2032 - hash: "eb9217410ea88877b037c9f8d38413ab" + hash: "205e79eb4a7e515ffa5bd24677408e79" } Frame { msec: 2048 - hash: "eb9217410ea88877b037c9f8d38413ab" + hash: "205e79eb4a7e515ffa5bd24677408e79" } Key { type: 6 @@ -862,7 +862,7 @@ VisualTest { } Frame { msec: 2064 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Key { type: 7 @@ -874,15 +874,15 @@ VisualTest { } Frame { msec: 2080 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2096 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2112 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Key { type: 7 @@ -894,27 +894,27 @@ VisualTest { } Frame { msec: 2128 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2144 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2160 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2176 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2192 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Frame { msec: 2208 - hash: "d4b86b88d417e168139671f762a129a9" + hash: "2c1570a63d3eff7346c58356610a2f44" } Key { type: 6 @@ -926,23 +926,23 @@ VisualTest { } Frame { msec: 2224 - hash: "bce77452be7f54a1f42685acb79ca5a3" + hash: "8202436b4e184adc69cdf7dd735afe33" } Frame { msec: 2240 - hash: "bce77452be7f54a1f42685acb79ca5a3" + hash: "8202436b4e184adc69cdf7dd735afe33" } Frame { msec: 2256 - hash: "bce77452be7f54a1f42685acb79ca5a3" + hash: "8202436b4e184adc69cdf7dd735afe33" } Frame { msec: 2272 - hash: "bce77452be7f54a1f42685acb79ca5a3" + hash: "8202436b4e184adc69cdf7dd735afe33" } Frame { msec: 2288 - hash: "bce77452be7f54a1f42685acb79ca5a3" + hash: "8202436b4e184adc69cdf7dd735afe33" } Key { type: 6 @@ -954,7 +954,7 @@ VisualTest { } Frame { msec: 2304 - hash: "c8040808e2d582a32d447eb885b6a72d" + hash: "855069b52f6714d54f4005751b8e2930" } Key { type: 7 @@ -966,15 +966,15 @@ VisualTest { } Frame { msec: 2320 - hash: "c8040808e2d582a32d447eb885b6a72d" + hash: "855069b52f6714d54f4005751b8e2930" } Frame { msec: 2336 - hash: "c8040808e2d582a32d447eb885b6a72d" + hash: "855069b52f6714d54f4005751b8e2930" } Frame { msec: 2352 - hash: "c8040808e2d582a32d447eb885b6a72d" + hash: "855069b52f6714d54f4005751b8e2930" } Key { type: 6 @@ -986,11 +986,11 @@ VisualTest { } Frame { msec: 2368 - hash: "5beb32a23637b51f1c9b117e93b2c1d0" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Frame { msec: 2384 - hash: "5beb32a23637b51f1c9b117e93b2c1d0" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Key { type: 7 @@ -1002,15 +1002,15 @@ VisualTest { } Frame { msec: 2400 - hash: "5beb32a23637b51f1c9b117e93b2c1d0" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Frame { msec: 2416 - hash: "5beb32a23637b51f1c9b117e93b2c1d0" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Frame { msec: 2432 - hash: "5beb32a23637b51f1c9b117e93b2c1d0" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Key { type: 7 @@ -1022,15 +1022,15 @@ VisualTest { } Frame { msec: 2448 - hash: "5beb32a23637b51f1c9b117e93b2c1d0" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Frame { msec: 2464 - hash: "e1020b6bb8ca2e9f0ce93f9047695f48" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Frame { msec: 2480 - hash: "e1020b6bb8ca2e9f0ce93f9047695f48" + hash: "6e1a97a3e491f24e34d4b24bf3091afc" } Key { type: 6 @@ -1042,19 +1042,19 @@ VisualTest { } Frame { msec: 2496 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2512 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2528 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2544 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Key { type: 7 @@ -1066,27 +1066,27 @@ VisualTest { } Frame { msec: 2560 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2576 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2592 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2608 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2624 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Frame { msec: 2640 - hash: "429296196c5ebf0094d5e76379f929c5" + hash: "12eb5152181e0bff993dc1be087969f9" } Key { type: 6 @@ -1098,19 +1098,19 @@ VisualTest { } Frame { msec: 2656 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Frame { msec: 2672 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Frame { msec: 2688 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Frame { msec: 2704 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Key { type: 7 @@ -1122,15 +1122,15 @@ VisualTest { } Frame { msec: 2720 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Frame { msec: 2736 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Frame { msec: 2752 - hash: "83a910a91a9c1ca60e8f021b7a96509e" + hash: "8a77655cae6c04453e6dc8a2321d1a32" } Key { type: 6 @@ -1142,23 +1142,23 @@ VisualTest { } Frame { msec: 2768 - hash: "4a2af150d069abfff098673375469b08" + hash: "c42349fe4b75e5d56a04ec6462cb0780" } Frame { msec: 2784 - hash: "4a2af150d069abfff098673375469b08" + hash: "c42349fe4b75e5d56a04ec6462cb0780" } Frame { msec: 2800 - hash: "4a2af150d069abfff098673375469b08" + hash: "c42349fe4b75e5d56a04ec6462cb0780" } Frame { msec: 2816 - hash: "4a2af150d069abfff098673375469b08" + hash: "c42349fe4b75e5d56a04ec6462cb0780" } Frame { msec: 2832 - hash: "4a2af150d069abfff098673375469b08" + hash: "c42349fe4b75e5d56a04ec6462cb0780" } Key { type: 6 @@ -1178,11 +1178,11 @@ VisualTest { } Frame { msec: 2848 - hash: "f1909371c6f44fb7547916340d043ac7" + hash: "973c163b1ea4e6189e788b7f37013185" } Frame { msec: 2864 - hash: "f1909371c6f44fb7547916340d043ac7" + hash: "973c163b1ea4e6189e788b7f37013185" } Frame { msec: 2880 @@ -1190,7 +1190,7 @@ VisualTest { } Frame { msec: 2896 - hash: "f1909371c6f44fb7547916340d043ac7" + hash: "973c163b1ea4e6189e788b7f37013185" } Key { type: 6 @@ -1202,11 +1202,11 @@ VisualTest { } Frame { msec: 2912 - hash: "35fecf3c5feda6afbd4eac5935dca7af" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 2928 - hash: "35fecf3c5feda6afbd4eac5935dca7af" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Key { type: 7 @@ -1218,11 +1218,11 @@ VisualTest { } Frame { msec: 2944 - hash: "35fecf3c5feda6afbd4eac5935dca7af" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 2960 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Key { type: 7 @@ -1234,35 +1234,35 @@ VisualTest { } Frame { msec: 2976 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 2992 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 3008 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 3024 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 3040 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 3056 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 3072 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Frame { msec: 3088 - hash: "d8e23c87332aed5105cb6d488efd4a63" + hash: "a847abc1ef9a41a741f8dce6bc68e6a1" } Key { type: 6 @@ -1274,23 +1274,23 @@ VisualTest { } Frame { msec: 3104 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3120 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3136 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3152 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3168 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Key { type: 7 @@ -1302,23 +1302,23 @@ VisualTest { } Frame { msec: 3184 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3200 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3216 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3232 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Frame { msec: 3248 - hash: "6c3f38c1180f392082e3879e35a23c5e" + hash: "93d3b56a5070a84164169ab1869d6ed0" } Key { type: 6 @@ -1330,15 +1330,15 @@ VisualTest { } Frame { msec: 3264 - hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3" + hash: "60480b61f29a34c790da8fe1bfd98755" } Frame { msec: 3280 - hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3" + hash: "60480b61f29a34c790da8fe1bfd98755" } Frame { msec: 3296 - hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3" + hash: "60480b61f29a34c790da8fe1bfd98755" } Key { type: 7 @@ -1350,15 +1350,15 @@ VisualTest { } Frame { msec: 3312 - hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3" + hash: "60480b61f29a34c790da8fe1bfd98755" } Frame { msec: 3328 - hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3" + hash: "60480b61f29a34c790da8fe1bfd98755" } Frame { msec: 3344 - hash: "54bbf6e8fbfc6e2a3e4f0886f1feade3" + hash: "60480b61f29a34c790da8fe1bfd98755" } Key { type: 6 @@ -1370,23 +1370,23 @@ VisualTest { } Frame { msec: 3360 - hash: "0e7fcbbe36c374e9436e5ecccd8663ee" + hash: "c6f235590c03170581dfabc07bf9c20b" } Frame { msec: 3376 - hash: "0e7fcbbe36c374e9436e5ecccd8663ee" + hash: "c6f235590c03170581dfabc07bf9c20b" } Frame { msec: 3392 - hash: "0e7fcbbe36c374e9436e5ecccd8663ee" + hash: "c6f235590c03170581dfabc07bf9c20b" } Frame { msec: 3408 - hash: "0e7fcbbe36c374e9436e5ecccd8663ee" + hash: "c6f235590c03170581dfabc07bf9c20b" } Frame { msec: 3424 - hash: "0e7fcbbe36c374e9436e5ecccd8663ee" + hash: "c6f235590c03170581dfabc07bf9c20b" } Key { type: 7 @@ -1398,15 +1398,15 @@ VisualTest { } Frame { msec: 3440 - hash: "0e7fcbbe36c374e9436e5ecccd8663ee" + hash: "c6f235590c03170581dfabc07bf9c20b" } Frame { msec: 3456 - hash: "4928b737a83471181066d043b51e939f" + hash: "c6f235590c03170581dfabc07bf9c20b" } Frame { msec: 3472 - hash: "4928b737a83471181066d043b51e939f" + hash: "c6f235590c03170581dfabc07bf9c20b" } Key { type: 6 @@ -1418,19 +1418,19 @@ VisualTest { } Frame { msec: 3488 - hash: "541901e223b7129edcbd2264da7e13cd" + hash: "10a29af771a5c17b1443b10abd45c9aa" } Frame { msec: 3504 - hash: "541901e223b7129edcbd2264da7e13cd" + hash: "10a29af771a5c17b1443b10abd45c9aa" } Frame { msec: 3520 - hash: "541901e223b7129edcbd2264da7e13cd" + hash: "10a29af771a5c17b1443b10abd45c9aa" } Frame { msec: 3536 - hash: "541901e223b7129edcbd2264da7e13cd" + hash: "10a29af771a5c17b1443b10abd45c9aa" } Key { type: 7 @@ -1442,11 +1442,11 @@ VisualTest { } Frame { msec: 3552 - hash: "541901e223b7129edcbd2264da7e13cd" + hash: "10a29af771a5c17b1443b10abd45c9aa" } Frame { msec: 3568 - hash: "541901e223b7129edcbd2264da7e13cd" + hash: "10a29af771a5c17b1443b10abd45c9aa" } Key { type: 6 @@ -1458,27 +1458,27 @@ VisualTest { } Frame { msec: 3584 - hash: "86aa5d4fdc4f92c2810ccb3d5e990e22" + hash: "68449dbef331f4bdf4c4bc443ec98e89" } Frame { msec: 3600 - hash: "86aa5d4fdc4f92c2810ccb3d5e990e22" + hash: "68449dbef331f4bdf4c4bc443ec98e89" } Frame { msec: 3616 - hash: "86aa5d4fdc4f92c2810ccb3d5e990e22" + hash: "68449dbef331f4bdf4c4bc443ec98e89" } Frame { msec: 3632 - hash: "86aa5d4fdc4f92c2810ccb3d5e990e22" + hash: "68449dbef331f4bdf4c4bc443ec98e89" } Frame { msec: 3648 - hash: "86aa5d4fdc4f92c2810ccb3d5e990e22" + hash: "68449dbef331f4bdf4c4bc443ec98e89" } Frame { msec: 3664 - hash: "86aa5d4fdc4f92c2810ccb3d5e990e22" + hash: "68449dbef331f4bdf4c4bc443ec98e89" } Key { type: 6 @@ -1490,7 +1490,7 @@ VisualTest { } Frame { msec: 3680 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Key { type: 7 @@ -1502,23 +1502,23 @@ VisualTest { } Frame { msec: 3696 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3712 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3728 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3744 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3760 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Key { type: 7 @@ -1530,19 +1530,19 @@ VisualTest { } Frame { msec: 3776 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3792 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3808 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3824 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3840 @@ -1550,19 +1550,19 @@ VisualTest { } Frame { msec: 3856 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3872 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3888 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Frame { msec: 3904 - hash: "af1a78eca66ce7523306aaf324a59af6" + hash: "5c773045e3ccab933749a3f6a74dc25a" } Key { type: 6 @@ -1574,23 +1574,23 @@ VisualTest { } Frame { msec: 3920 - hash: "c72ed9cecd1144b7e937c2c3c33ab0b8" + hash: "f1ef12790a0548cfaa4176680566680d" } Frame { msec: 3936 - hash: "c72ed9cecd1144b7e937c2c3c33ab0b8" + hash: "f1ef12790a0548cfaa4176680566680d" } Frame { msec: 3952 - hash: "c72ed9cecd1144b7e937c2c3c33ab0b8" + hash: "f1ef12790a0548cfaa4176680566680d" } Frame { msec: 3968 - hash: "e00d1a6f1ceb15493e87151071d8ad3f" + hash: "f1ef12790a0548cfaa4176680566680d" } Frame { msec: 3984 - hash: "e00d1a6f1ceb15493e87151071d8ad3f" + hash: "f1ef12790a0548cfaa4176680566680d" } Key { type: 7 @@ -1602,11 +1602,11 @@ VisualTest { } Frame { msec: 4000 - hash: "e00d1a6f1ceb15493e87151071d8ad3f" + hash: "f1ef12790a0548cfaa4176680566680d" } Frame { msec: 4016 - hash: "e00d1a6f1ceb15493e87151071d8ad3f" + hash: "f1ef12790a0548cfaa4176680566680d" } Key { type: 6 @@ -1618,15 +1618,15 @@ VisualTest { } Frame { msec: 4032 - hash: "9b129865b81189be8c2e59178c009cd9" + hash: "22575a03b4c58e4391845d495c2ca48b" } Frame { msec: 4048 - hash: "9b129865b81189be8c2e59178c009cd9" + hash: "22575a03b4c58e4391845d495c2ca48b" } Frame { msec: 4064 - hash: "9b129865b81189be8c2e59178c009cd9" + hash: "22575a03b4c58e4391845d495c2ca48b" } Key { type: 7 @@ -1638,7 +1638,7 @@ VisualTest { } Frame { msec: 4080 - hash: "9b129865b81189be8c2e59178c009cd9" + hash: "22575a03b4c58e4391845d495c2ca48b" } Key { type: 6 @@ -1650,19 +1650,19 @@ VisualTest { } Frame { msec: 4096 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Frame { msec: 4112 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Frame { msec: 4128 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Frame { msec: 4144 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Key { type: 7 @@ -1674,15 +1674,15 @@ VisualTest { } Frame { msec: 4160 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Frame { msec: 4176 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Frame { msec: 4192 - hash: "ccbc7a847315311d9661b7c3fc6057d6" + hash: "3243dc4562f073136782415365b7b42d" } Key { type: 6 @@ -1694,23 +1694,23 @@ VisualTest { } Frame { msec: 4208 - hash: "3532604c4d8bb23fc8fd44a153708f23" + hash: "44cd04d2a2bf12654cb96ec9af92b9aa" } Frame { msec: 4224 - hash: "3532604c4d8bb23fc8fd44a153708f23" + hash: "44cd04d2a2bf12654cb96ec9af92b9aa" } Frame { msec: 4240 - hash: "3532604c4d8bb23fc8fd44a153708f23" + hash: "44cd04d2a2bf12654cb96ec9af92b9aa" } Frame { msec: 4256 - hash: "3532604c4d8bb23fc8fd44a153708f23" + hash: "44cd04d2a2bf12654cb96ec9af92b9aa" } Frame { msec: 4272 - hash: "3532604c4d8bb23fc8fd44a153708f23" + hash: "44cd04d2a2bf12654cb96ec9af92b9aa" } Key { type: 6 @@ -1722,7 +1722,7 @@ VisualTest { } Frame { msec: 4288 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Key { type: 7 @@ -1734,15 +1734,15 @@ VisualTest { } Frame { msec: 4304 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Frame { msec: 4320 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Frame { msec: 4336 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Key { type: 7 @@ -1754,23 +1754,23 @@ VisualTest { } Frame { msec: 4352 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Frame { msec: 4368 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Frame { msec: 4384 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Frame { msec: 4400 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Frame { msec: 4416 - hash: "7a951d7233a41e872aa8f8784edc1bff" + hash: "cf1eb35cb9a793769303abee0a2fcad8" } Key { type: 6 @@ -1782,15 +1782,15 @@ VisualTest { } Frame { msec: 4432 - hash: "41683813bcdc1761003a9bece7752516" + hash: "252838a495502ba5b836ffd1b20711f4" } Frame { msec: 4448 - hash: "41683813bcdc1761003a9bece7752516" + hash: "252838a495502ba5b836ffd1b20711f4" } Frame { msec: 4464 - hash: "be52b6b350696bb8e883bd24750cce06" + hash: "252838a495502ba5b836ffd1b20711f4" } Key { type: 7 @@ -1802,23 +1802,23 @@ VisualTest { } Frame { msec: 4480 - hash: "be52b6b350696bb8e883bd24750cce06" + hash: "252838a495502ba5b836ffd1b20711f4" } Frame { msec: 4496 - hash: "be52b6b350696bb8e883bd24750cce06" + hash: "252838a495502ba5b836ffd1b20711f4" } Frame { msec: 4512 - hash: "be52b6b350696bb8e883bd24750cce06" + hash: "252838a495502ba5b836ffd1b20711f4" } Frame { msec: 4528 - hash: "be52b6b350696bb8e883bd24750cce06" + hash: "252838a495502ba5b836ffd1b20711f4" } Frame { msec: 4544 - hash: "be52b6b350696bb8e883bd24750cce06" + hash: "252838a495502ba5b836ffd1b20711f4" } Key { type: 6 @@ -1830,19 +1830,19 @@ VisualTest { } Frame { msec: 4560 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Frame { msec: 4576 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Frame { msec: 4592 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Frame { msec: 4608 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Key { type: 7 @@ -1854,19 +1854,19 @@ VisualTest { } Frame { msec: 4624 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Frame { msec: 4640 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Frame { msec: 4656 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Frame { msec: 4672 - hash: "f4845e51dfb18617fe31471b0cb3bf16" + hash: "4010bb0f50630f067974e6ddb3177693" } Key { type: 6 @@ -1878,19 +1878,19 @@ VisualTest { } Frame { msec: 4688 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Frame { msec: 4704 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Frame { msec: 4720 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Frame { msec: 4736 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Key { type: 7 @@ -1902,15 +1902,15 @@ VisualTest { } Frame { msec: 4752 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Frame { msec: 4768 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Frame { msec: 4784 - hash: "4e994f63cd763db43435fd39e864585c" + hash: "14dc6ee8cd3b4747650f2a458b42a6e3" } Key { type: 6 @@ -1926,7 +1926,7 @@ VisualTest { } Frame { msec: 4816 - hash: "2b5db83aff14077f625dbfc75830b2b0" + hash: "7d4a56854715772c92706522d2dcac56" } Key { type: 7 @@ -1938,19 +1938,19 @@ VisualTest { } Frame { msec: 4832 - hash: "2b5db83aff14077f625dbfc75830b2b0" + hash: "7d4a56854715772c92706522d2dcac56" } Frame { msec: 4848 - hash: "2b5db83aff14077f625dbfc75830b2b0" + hash: "7d4a56854715772c92706522d2dcac56" } Frame { msec: 4864 - hash: "2b5db83aff14077f625dbfc75830b2b0" + hash: "7d4a56854715772c92706522d2dcac56" } Frame { msec: 4880 - hash: "2b5db83aff14077f625dbfc75830b2b0" + hash: "7d4a56854715772c92706522d2dcac56" } Key { type: 6 @@ -1962,19 +1962,19 @@ VisualTest { } Frame { msec: 4896 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 4912 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 4928 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 4944 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Key { type: 7 @@ -1986,203 +1986,203 @@ VisualTest { } Frame { msec: 4960 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 4976 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 4992 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5008 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5024 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5040 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5056 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5072 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5088 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5104 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5120 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5136 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5152 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5168 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5184 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5200 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5216 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5232 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5248 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5264 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5280 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5296 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5312 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5328 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5344 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5360 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5376 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5392 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5408 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5424 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5440 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5456 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5472 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5488 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5504 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5520 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5536 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5552 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5568 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5584 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5600 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5616 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5632 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5648 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5664 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5680 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5696 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5712 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5728 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5744 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5760 @@ -2190,239 +2190,239 @@ VisualTest { } Frame { msec: 5776 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5792 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5808 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5824 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5840 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5856 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5872 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5888 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5904 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5920 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5936 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5952 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5968 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 5984 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6000 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6016 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6032 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6048 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6064 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6080 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6096 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6112 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6128 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6144 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6160 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6176 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6192 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6208 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6224 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6240 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6256 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6272 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6288 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6304 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6320 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6336 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6352 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6368 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6384 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6400 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6416 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6432 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6448 - hash: "f902766808596ea423cbc0b7e9bdd87a" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6464 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6480 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6496 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6512 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6528 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6544 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6560 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6576 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6592 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6608 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6624 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6640 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6656 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6672 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6688 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6704 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6720 @@ -2430,38 +2430,38 @@ VisualTest { } Frame { msec: 6736 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6752 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6768 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6784 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6800 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6816 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6832 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6848 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } Frame { msec: 6864 - hash: "566cba616a99c92c228a4c312466b96b" + hash: "0c75eb65cf70c883ee4dcd2f7ee092ce" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png Binary files differindex d889eef..1d96795 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png Binary files differindex 0c8c250..a3a9bfa 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png Binary files differindex 76b7fce..b50028c 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png Binary files differindex ecc8568..1c4876e 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png Binary files differindex 766abaf..9d110cb 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml index 37f5e46..bd4af6a 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/cursorDelegate.qml @@ -6,115 +6,115 @@ VisualTest { } Frame { msec: 16 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 32 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 48 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 64 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 80 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 96 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 112 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 128 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 144 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 160 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 176 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 192 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 208 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 224 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 240 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 256 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 272 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 288 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 304 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 320 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 336 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 352 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 368 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 384 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 400 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 416 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 432 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Frame { msec: 448 - hash: "79b388ca7d46e1efb38672c6bf8837f8" + hash: "c0ffaa97d1be341fafafc18762f5cb67" } Key { type: 6 @@ -126,23 +126,23 @@ VisualTest { } Frame { msec: 464 - hash: "52c03d5681cadb1df400a0974261e05d" + hash: "eadbfc95de35a0d1880809b2bbaec562" } Frame { msec: 480 - hash: "52c03d5681cadb1df400a0974261e05d" + hash: "eadbfc95de35a0d1880809b2bbaec562" } Frame { msec: 496 - hash: "52c03d5681cadb1df400a0974261e05d" + hash: "eadbfc95de35a0d1880809b2bbaec562" } Frame { msec: 512 - hash: "52c03d5681cadb1df400a0974261e05d" + hash: "eadbfc95de35a0d1880809b2bbaec562" } Frame { msec: 528 - hash: "9c280c469d12fc0bf1ff42883ffd5155" + hash: "227cbfe5fc07906060951e19ebb3ad30" } Key { type: 7 @@ -154,19 +154,19 @@ VisualTest { } Frame { msec: 544 - hash: "655716f3544c6ae649cbda487ed1916f" + hash: "066256a59ad290b3725193955e3c48a6" } Frame { msec: 560 - hash: "e9e6a20040bedf4afb670310a7e5c2f0" + hash: "6709f77cbcde82886d1c5a07f06b55a5" } Frame { msec: 576 - hash: "842641682f22e370402857b9cb875192" + hash: "da0028083048837b4756a2d3ff468378" } Frame { msec: 592 - hash: "4d8258cd2fea9b4bee647b9480a743e3" + hash: "5f265351bed34357d603794d868dbcbc" } Key { type: 6 @@ -178,19 +178,19 @@ VisualTest { } Frame { msec: 608 - hash: "eb7d48cbf4cad403eb7d3fa2d10e0f88" + hash: "3b8030849229e90b69842219e8b2d3f1" } Frame { msec: 624 - hash: "c6387240c7075e8321fda5348de9b752" + hash: "0b08356d9b00313b2d892175dd93095a" } Frame { msec: 640 - hash: "98fb4f03db3a574cf96e88ca940fcd07" + hash: "4780555b277d65e3e4c0c60817b63eb4" } Frame { msec: 656 - hash: "19d450ee21b0c525aba2c38e62c5b117" + hash: "6b31c8f0569d01d97a371423a0f379c0" } Key { type: 7 @@ -202,19 +202,19 @@ VisualTest { } Frame { msec: 672 - hash: "9943426dd31b393c4831dcfcdb266f76" + hash: "e9a5695636f7957d33f1c902a37a605d" } Frame { msec: 688 - hash: "318bd0909d6ab32fc15ee385b69e1dc2" + hash: "27a783cd4ef5caab382721a98f7966da" } Frame { msec: 704 - hash: "ca5f62f289b5f86e6d86afdcb0bc05f5" + hash: "c50598c0a5f8d501fd3ac9cddecee506" } Frame { msec: 720 - hash: "2158851f276862dd1e2a7d3fee9af938" + hash: "2a2d0e202bc3bf7991409391a2ce2934" } Key { type: 6 @@ -226,19 +226,19 @@ VisualTest { } Frame { msec: 736 - hash: "746e28cf8df1bcfd5a07383e4f9e1420" + hash: "2d97b8503c739b210615971ad08c2714" } Frame { msec: 752 - hash: "8ae15b54e47c6ba43b6ddad234a65499" + hash: "f27fd7f1d8c6dfb7393ab0d39ed5cd02" } Frame { msec: 768 - hash: "8fcb22bd16dafb62a2fdcd40feda5178" + hash: "32d256543e3e1ba722860e5143af9f09" } Frame { msec: 784 - hash: "1ef6e14540615967e7c059fb3299c38a" + hash: "9123b724613ef4d3d8431afde6e9eb6b" } Key { type: 7 @@ -250,23 +250,23 @@ VisualTest { } Frame { msec: 800 - hash: "cd260f4aa6e9772668b13f1f5e4ab3db" + hash: "be5249a7effc94ec2be3d6053eba7b45" } Frame { msec: 816 - hash: "44aaa31fe7183e0088eb9ec12cfef69f" + hash: "57f2c119c9eca3d1e4acd2f775af5207" } Frame { msec: 832 - hash: "575b1fbc9fa6587ce9811b5074a47a84" + hash: "23b79a2630448e99f27a657fd9789354" } Frame { msec: 848 - hash: "83b1fe02fdbe16418231c8acbbbebcac" + hash: "c8faab137cbc014aef5e3212889d00b8" } Frame { msec: 864 - hash: "7bfb6f545fd55e7e336431e6882c9974" + hash: "c9616f6fde5d6a8ecf346ece9952f09b" } Key { type: 6 @@ -278,15 +278,15 @@ VisualTest { } Frame { msec: 880 - hash: "bf3a6677b5f815e1b66f6489032f8e1d" + hash: "11a861ca71d789e3d97d599608a793be" } Frame { msec: 896 - hash: "cfcd90f1e97e92b0fbe2595275a64a48" + hash: "5a6c57df0c33b83985aeb194f291ad6c" } Frame { msec: 912 - hash: "397ad28f60e1f5245b59380968ececd2" + hash: "2c047359db6946cb740462b0d6c695be" } Key { type: 7 @@ -298,11 +298,11 @@ VisualTest { } Frame { msec: 928 - hash: "c6ea797bc327a7e31316f44e93d6beb9" + hash: "d0bb54caf661be021be8fe2691de24e8" } Frame { msec: 944 - hash: "0e3c15c5328c85a54826b65ec82007f5" + hash: "80f0a60239f4d81b18b9cb3e80faf346" } Frame { msec: 960 @@ -310,11 +310,11 @@ VisualTest { } Frame { msec: 976 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 992 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Key { type: 6 @@ -326,15 +326,15 @@ VisualTest { } Frame { msec: 1008 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 1024 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 1040 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Key { type: 7 @@ -346,23 +346,23 @@ VisualTest { } Frame { msec: 1056 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 1072 - hash: "676e251f10800c2a8860b43c2546524d" + hash: "5f6cc0c97e4748aeeaa4a00c8a8c8928" } Frame { msec: 1088 - hash: "db99874ab3656663316931ea0ac4c7c3" + hash: "b1d71160d9a8a8edeb4cf7e00df36cfc" } Frame { msec: 1104 - hash: "2c4b2205df96e09a9cd91d5efb86d820" + hash: "5bfd4269145cc0962e0fa9c294e8f5aa" } Frame { msec: 1120 - hash: "25e6e81e4769751e9639ee4a3c4ae839" + hash: "4e22c95802d83f0099017c6be9d93214" } Key { type: 6 @@ -374,23 +374,23 @@ VisualTest { } Frame { msec: 1136 - hash: "9eaa29386d3ad22b9032b8b345739342" + hash: "0f31d8f4867af7c2f4fb8e86aa077afd" } Frame { msec: 1152 - hash: "21ebb054c5df6104bb01e0a8abe9b40c" + hash: "21a552133320008a4d4f77752a3cfb55" } Frame { msec: 1168 - hash: "3ab8cdbe65ea34868c1a917e42d31c14" + hash: "3a30a4a785de21da0ff939e303202a81" } Frame { msec: 1184 - hash: "05badd00be618fc4395e80936284613f" + hash: "b0e3ed2468538aacec354cb96d90c362" } Frame { msec: 1200 - hash: "8a373ed9798a8dd33aab5191db06f190" + hash: "56bf6e3fe47e52046b443481fc17a3ec" } Key { type: 7 @@ -402,27 +402,27 @@ VisualTest { } Frame { msec: 1216 - hash: "2a8c6a7cd20fcf7b5c8b75c59f50276b" + hash: "ce80807cde9b902ebf33281fce50d9fb" } Frame { msec: 1232 - hash: "2e874a6b741d1cbfde5544fb831bdf84" + hash: "ed67b18b5f7b90d3bcd9f662e70dc7b8" } Frame { msec: 1248 - hash: "36e3d3a9a4e7163a1c052f30a97697dc" + hash: "930950ce5c6b12da47eea1b92d5176eb" } Frame { msec: 1264 - hash: "fb18565ab22f6b397aef65a992c0dff8" + hash: "5a2eeca0f1533d323cc4d7ffbb7ad6aa" } Frame { msec: 1280 - hash: "13763364dd631556988fe18afce23e84" + hash: "3f7f3ef2d4c1353dfe7027930505f4fd" } Frame { msec: 1296 - hash: "2ea2995a7c022a4959eb1128d69907cc" + hash: "1a3a781ac5a1e90a4415944e0c54ea4e" } Key { type: 6 @@ -434,7 +434,7 @@ VisualTest { } Frame { msec: 1312 - hash: "88485c98b946476b52094c85702939d4" + hash: "d11dae0dd461fc82a73bf319905320d4" } Key { type: 6 @@ -446,19 +446,19 @@ VisualTest { } Frame { msec: 1328 - hash: "532586645946f17a274a3f7d1077e55b" + hash: "00957049ea51866138cfc33451f12e17" } Frame { msec: 1344 - hash: "1702f1badb65f4039536c7255220a4b9" + hash: "386847af9b173db7ef1554d2c85c748e" } Frame { msec: 1360 - hash: "7cd23a8548d9d2d7da78fa541d1ff9ba" + hash: "4b715060d29d6228a40217bc769fc140" } Frame { msec: 1376 - hash: "42a4e0f3511d45f56e445737cbda49b5" + hash: "e58a9a3623afa08819351c22435ba03f" } Key { type: 6 @@ -470,31 +470,31 @@ VisualTest { } Frame { msec: 1392 - hash: "e326fff480404a41735b1567a784ba80" + hash: "6378e3faf5578818fc282de2a077da59" } Frame { msec: 1408 - hash: "4d972a5cfa88e86c72dc1fa7430090e4" + hash: "07efb3687d29e65680e1cc831762348f" } Frame { msec: 1424 - hash: "691c28e265d5cd253c06f6feff7ee536" + hash: "5292e7c95b3c5b11e4088b5010984257" } Frame { msec: 1440 - hash: "3ebb2496ec085b92a8f130e4f54c26c9" + hash: "ffe95603f5fe9d63abb3b77c399c3b11" } Frame { msec: 1456 - hash: "2447e98313dc850f58333c7aa630ef28" + hash: "ad7cb73893c27b69704c5b821738a3c1" } Frame { msec: 1472 - hash: "9d8bc16d365e534e4e1feee7185db44f" + hash: "e25971a61888ded93b651891ec9661b0" } Frame { msec: 1488 - hash: "9a4b9cb5396857f79eac3a0a4e1dc1b3" + hash: "80f90b3623bf34544438dd00abee7037" } Key { type: 7 @@ -506,51 +506,51 @@ VisualTest { } Frame { msec: 1504 - hash: "2d25e8fc011ec795e1596806a81be60d" + hash: "797dd70572e532d4acb374230b2c8efe" } Frame { msec: 1520 - hash: "2fce48cf607cc3809ee1a9f59323e23a" + hash: "0673db1283d874a5711520f272572cf8" } Frame { msec: 1536 - hash: "0fa177b9aa230dbcd5032a6ecddf604a" + hash: "fbc8434912f08a93b5f884258bc754b7" } Frame { msec: 1552 - hash: "2dd53f15e0787337ce0590223e5ce788" + hash: "e41ebaf8f2114a6e8f38f731ea164e8a" } Frame { msec: 1568 - hash: "385d08fa990f40a7a1d5fd61fa9fe7ae" + hash: "d14bdb5bf1b4756166ecf6f3255bf3cc" } Frame { msec: 1584 - hash: "481401635bd419b8a30435135f61223f" + hash: "5fb04569aa0e530b898a3c11725b947e" } Frame { msec: 1600 - hash: "d6600e6fcfd477100b7aab3509888512" + hash: "03d24457fae160864fec985765f6d8d1" } Frame { msec: 1616 - hash: "4ede7ec537b56352dec575bbb7dbd482" + hash: "56dad740bb9032d113a0dacbe986c9c0" } Frame { msec: 1632 - hash: "d4ff15c0dcf76dd7c97a0bf1901d688e" + hash: "70d9acda83aa7db59780cf56f03e38ec" } Frame { msec: 1648 - hash: "d15c7df693dfb0ef48c30d5f73b34126" + hash: "a272e39bc1af0f4d1bab9c3f64e746e2" } Frame { msec: 1664 - hash: "6dee0c6a00fb378692277914d22607e6" + hash: "cf0379de604b9bb33b4456cb89e09afd" } Frame { msec: 1680 - hash: "8d74e52fca14ec36b266ace5113cac2b" + hash: "332e7a10d75c0d21a24fc8be34269629" } Key { type: 6 @@ -562,31 +562,31 @@ VisualTest { } Frame { msec: 1696 - hash: "a33b648bc08e2b0db4e04a28dc7f64a2" + hash: "c07eb71d90e74393205338bc946c1e43" } Frame { msec: 1712 - hash: "04af2732e95351448a3a4e5a12eb2c0d" + hash: "984477de7c103ff3aebc2634785dce09" } Frame { msec: 1728 - hash: "72795cad18792504420251987d814cc5" + hash: "958f79dd7c57387042746df2ca01779e" } Frame { msec: 1744 - hash: "46e3c02ca6ea9c831b276c6f0ef954db" + hash: "53bb3f0718d6333ca40dc279b6300b85" } Frame { msec: 1760 - hash: "42173174a90d470901cd543e2bd57225" + hash: "c16877cb99997cc47f1fff5af1d22bd7" } Frame { msec: 1776 - hash: "57e7d302246a27430b1e60fdbdfc368a" + hash: "dea3e1eb6c72f0d37398e3e301a23c19" } Frame { msec: 1792 - hash: "896b150b47d87ec3d279ab149195758e" + hash: "6bb7918f0794e6a7cbdb8847cdcf6e35" } Key { type: 7 @@ -598,19 +598,19 @@ VisualTest { } Frame { msec: 1808 - hash: "041240041c62b4cef6f329328eee2c6f" + hash: "6858cd874abb1ed2fec34862f76044fa" } Frame { msec: 1824 - hash: "46e38ca8d4d827dc71719d662d433983" + hash: "47b546ea0d5b1d4573991d4738c37f4d" } Frame { msec: 1840 - hash: "7d6ea4d357f0e916eaae3edd662bec9e" + hash: "6c9e636dee2bb5f2a72a2c08ab9fb970" } Frame { msec: 1856 - hash: "b1214158b7f01fde56ec436baf88b98f" + hash: "42c2b2a7f41c88ae7bb19403e2460a17" } Key { type: 7 @@ -622,7 +622,7 @@ VisualTest { } Frame { msec: 1872 - hash: "22b59737bb8ef5ffc78f1ef4a707d328" + hash: "80b7986af693b89dc4d4f9533dae85cb" } Key { type: 6 @@ -634,11 +634,11 @@ VisualTest { } Frame { msec: 1888 - hash: "70b47f9af5373d4d5e0777eb169cbfe3" + hash: "631bea21dde9b7647f5843bc3513f3ba" } Frame { msec: 1904 - hash: "d02ddd6f4b7169dcd114c519843eb855" + hash: "cc40335abbea0d589180096f7d8f5426" } Frame { msec: 1920 @@ -646,31 +646,31 @@ VisualTest { } Frame { msec: 1936 - hash: "5af4a21ba6e3b5e994557831d7063e92" + hash: "1c03b5384a889fe233eb1c6d14a55f36" } Frame { msec: 1952 - hash: "97ef4122641ac4c49b9ef9a9dc1e5a0a" + hash: "7762cc4e6cf681311f5296de698c950b" } Frame { msec: 1968 - hash: "7794188761d3efa4b47d4ab4c07208a3" + hash: "678eed1d1fec30b02156d690777397c1" } Frame { msec: 1984 - hash: "4ca45c199693e767448016c4ccf1daaf" + hash: "96f51fee5c7baf78a3465420d63a9e5f" } Frame { msec: 2000 - hash: "4ca45c199693e767448016c4ccf1daaf" + hash: "96f51fee5c7baf78a3465420d63a9e5f" } Frame { msec: 2016 - hash: "4ca45c199693e767448016c4ccf1daaf" + hash: "96f51fee5c7baf78a3465420d63a9e5f" } Frame { msec: 2032 - hash: "4ca45c199693e767448016c4ccf1daaf" + hash: "96f51fee5c7baf78a3465420d63a9e5f" } Key { type: 7 @@ -682,7 +682,7 @@ VisualTest { } Frame { msec: 2048 - hash: "4ca45c199693e767448016c4ccf1daaf" + hash: "96f51fee5c7baf78a3465420d63a9e5f" } Key { type: 7 @@ -694,27 +694,27 @@ VisualTest { } Frame { msec: 2064 - hash: "7794188761d3efa4b47d4ab4c07208a3" + hash: "678eed1d1fec30b02156d690777397c1" } Frame { msec: 2080 - hash: "97ef4122641ac4c49b9ef9a9dc1e5a0a" + hash: "7762cc4e6cf681311f5296de698c950b" } Frame { msec: 2096 - hash: "5af4a21ba6e3b5e994557831d7063e92" + hash: "1c03b5384a889fe233eb1c6d14a55f36" } Frame { msec: 2112 - hash: "6f0f9bfa49f50ffd18ffe695cdc56d73" + hash: "2cd264339edc0338fc610e0d766425cc" } Frame { msec: 2128 - hash: "d02ddd6f4b7169dcd114c519843eb855" + hash: "cc40335abbea0d589180096f7d8f5426" } Frame { msec: 2144 - hash: "70b47f9af5373d4d5e0777eb169cbfe3" + hash: "631bea21dde9b7647f5843bc3513f3ba" } Key { type: 6 @@ -726,27 +726,27 @@ VisualTest { } Frame { msec: 2160 - hash: "9e770dcd2f33ad157e86d08752458daf" + hash: "c5199c908df1f550d7c4f133eb926134" } Frame { msec: 2176 - hash: "b6c660ffd14bb756f87adb5cf836e97f" + hash: "483eca22c50750e7591785ed60813d1f" } Frame { msec: 2192 - hash: "c498c154fcf2d66fc0981150e575033c" + hash: "4091de379d8f6ccc7f19ea39f6c7993a" } Frame { msec: 2208 - hash: "29277da2d1d6251e18ab89331d5df61d" + hash: "cd58c0d4f7248315a787542b0edcb4fb" } Frame { msec: 2224 - hash: "3c7588de81cbfbba8735da74de220128" + hash: "458895f9ede4d56e0b851c6ed124405d" } Frame { msec: 2240 - hash: "4fa61e0644ce0942a30f05ad8d3f13f6" + hash: "29a28a97fc78a1b01252b852fb0446e2" } Key { type: 7 @@ -758,31 +758,31 @@ VisualTest { } Frame { msec: 2256 - hash: "3a90bb8b912d0be07e0e8b78407c54ff" + hash: "4fd9f22ad06e02b68319c298c2286e36" } Frame { msec: 2272 - hash: "3d89454f0af4ab88ea67a075cb4e39b7" + hash: "a588e9dbeabd7519cd0cf2d26a123529" } Frame { msec: 2288 - hash: "abdd589312402caea0b1c4f26ff6a1bf" + hash: "bb74f706477e277284fad50752f078b5" } Frame { msec: 2304 - hash: "e6ab11dfb1965e94f5a42f2642ca0b30" + hash: "38f16a7deeaea6828edd15b00024fc19" } Frame { msec: 2320 - hash: "c9fbfb63e19d1281b0c3a59504cd695c" + hash: "30c4aa33a6672f4df24186ad1e28bcf9" } Frame { msec: 2336 - hash: "bc250ab3f5da66ecb0792a796b197149" + hash: "7f2ac0854ddbcca94a2ad160ead5d4d3" } Frame { msec: 2352 - hash: "c5d26cd3ac3f87c77d716b912875b9de" + hash: "e1c083d0235ff5a2e002ce78f43009b0" } Key { type: 6 @@ -802,23 +802,23 @@ VisualTest { } Frame { msec: 2368 - hash: "bbe9837039b7ea1dfab8ed30c8a15724" + hash: "eaee6483a2a4a0b09a8e40bb1785a498" } Frame { msec: 2384 - hash: "836f9f207d8197f8e6e8e9c49f83aa4e" + hash: "26530bded6311640c4d3f6d1485fa7d3" } Frame { msec: 2400 - hash: "235d20a347a0f7b331e707ad7de93f95" + hash: "e54102edbf6cc0c9a32b09858f760ee5" } Frame { msec: 2416 - hash: "7f422b624488525aede06c69996fc583" + hash: "27434828de3ba8f6a3b83f042b70eb8b" } Frame { msec: 2432 - hash: "664bef152c87b3eb6729d9b46bad750c" + hash: "fdf68e988b988d068ea78a5a09ef349e" } Key { type: 6 @@ -830,23 +830,23 @@ VisualTest { } Frame { msec: 2448 - hash: "d32716cb4cb9fc8145029efb3fd1a32a" + hash: "0e1e9a2cf891cf65f30ead539becf408" } Frame { msec: 2464 - hash: "17670e9d61ef2f9a0ec079b413ab546a" + hash: "46602c03632f6a47c9d523e1ea61baaf" } Frame { msec: 2480 - hash: "6a3cbc70476d4e145a0e187ad7a73c52" + hash: "5c758ee2aa3f92b6506533f6d615bc20" } Frame { msec: 2496 - hash: "aa0f4cf316026154c940261b4df848e3" + hash: "25edbdaae72e03426c9dfa75c08c33e6" } Frame { msec: 2512 - hash: "2650d86c6aa82e4cc5e7ec4e2889f028" + hash: "a4bd11f15594932b996a069f3098c596" } Key { type: 7 @@ -858,23 +858,23 @@ VisualTest { } Frame { msec: 2528 - hash: "ab392121c99d4f8f5a3622c26761a57e" + hash: "e4090b920ce2456149155f61fb586a6f" } Frame { msec: 2544 - hash: "4f1c4006a84d794a7eaf9932a6f7d3ea" + hash: "ce71f4dc76f90fa300d715ed77e8a5a8" } Frame { msec: 2560 - hash: "f6387eb0678a78894f607a7ff186bd19" + hash: "59414694d42a3942c4832fd7a3e93145" } Frame { msec: 2576 - hash: "b14cb2545cb2cc055b914618d5086425" + hash: "1213fc9d9c1d58ceefc213a59f970679" } Frame { msec: 2592 - hash: "e31ebced4421e9d5092950d373f9a4e9" + hash: "bbfa8471ab3fa5fc146946a6c8e0ce86" } Key { type: 6 @@ -886,15 +886,15 @@ VisualTest { } Frame { msec: 2608 - hash: "b2177f1eed72624c4f6e4bd59902db16" + hash: "22a49c3b5234b4b7a2b935d58027f834" } Frame { msec: 2624 - hash: "9ade9a8b436bb9481e8135b7342070ff" + hash: "7b81c14d5350fb55775c1cb0f3945c46" } Frame { msec: 2640 - hash: "4bdbc37f8ecac1a8aae182cb3e6bf1fa" + hash: "8ebf266de0df228e47cc6e5a8758a6ea" } Key { type: 7 @@ -906,23 +906,23 @@ VisualTest { } Frame { msec: 2656 - hash: "3bf69edaa0eec73246c52f310079a15d" + hash: "6344eb333dc28672f863bcb7ca5d6cfe" } Frame { msec: 2672 - hash: "add80b7fde2865bb23ccb46a03b5604c" + hash: "8efc9b4a6c27b8918cba629a5a1c0f24" } Frame { msec: 2688 - hash: "6259b8d763f468054f35c87f4ba47d30" + hash: "b586c24ce0c04391a9095c0ac4b7a05a" } Frame { msec: 2704 - hash: "1dd94dcd8c7f651811f1b962a75962be" + hash: "191413fe51a6887ae92c135252fdeeae" } Frame { msec: 2720 - hash: "f813c62008a3880d079cb1c0be9a03e1" + hash: "fc0b37abf12827af41e7037eab8ba5c8" } Key { type: 6 @@ -934,19 +934,19 @@ VisualTest { } Frame { msec: 2736 - hash: "4e776b52bce5b0e0ee46f9feff684a90" + hash: "5efe28d02b93e094192d7fd6fe753acd" } Frame { msec: 2752 - hash: "cd2c2b6e9d05b521214eeab29e89d7c4" + hash: "dadc1f7b14fbf9f8a174821c4197da46" } Frame { msec: 2768 - hash: "8605360fcf3f24372463827a1d3f93c6" + hash: "124deac57a3eeaef4cb3c0c802bacc05" } Frame { msec: 2784 - hash: "03b734ffb679f8718999c4e060a2febb" + hash: "e022a6d66a7b37d72885a7a7f6919433" } Key { type: 7 @@ -958,23 +958,23 @@ VisualTest { } Frame { msec: 2800 - hash: "43e2020cd127ce541b54ba7814c9ba74" + hash: "5faa6543469753948b1636351d044329" } Frame { msec: 2816 - hash: "9c1774f8ae01e37aac05d27567d3cec6" + hash: "a7dcf5a0b9bb00105eed173b498cb95c" } Frame { msec: 2832 - hash: "6c4a7a200eba8b6c5c0b5b75d8a88811" + hash: "29ac83d169af2c74ffd134d771c88718" } Frame { msec: 2848 - hash: "21d88afb0f05ace0710da47af275d827" + hash: "0a04648fdc90ec86fb55ad3a165573c4" } Frame { msec: 2864 - hash: "42b56667390aa2db6d593b7af9a5021a" + hash: "d699c713ba939612f1e552e48db19b18" } Frame { msec: 2880 @@ -982,51 +982,51 @@ VisualTest { } Frame { msec: 2896 - hash: "5897cafae19f8842f53a54b75e36f22d" + hash: "adf564652cfae394869755ff2fe5b534" } Frame { msec: 2912 - hash: "11cacddae5d5361b7e87696808ac2905" + hash: "d1453f663217ee45a8462b7d077d7f6a" } Frame { msec: 2928 - hash: "2cc3dcb900ab2bffd52fb61fff108043" + hash: "9f1461d63ccc49f83e58245ba75685e1" } Frame { msec: 2944 - hash: "8938b8c7254873197e409206c1c20ad4" + hash: "8cece1543e7e9190eefaa92c2024cbd1" } Frame { msec: 2960 - hash: "e343d647f236969530d0b076c3375f1a" + hash: "555abf8bc3fdb1eef85b1e4bd54932a3" } Frame { msec: 2976 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 2992 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 3008 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 3024 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 3040 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 3056 - hash: "5e39a0f9bdc45a7a288f59b7cbbf749d" + hash: "7fc65284b99fc548de0985d94a145fa7" } Frame { msec: 3072 - hash: "e343d647f236969530d0b076c3375f1a" + hash: "555abf8bc3fdb1eef85b1e4bd54932a3" } Key { type: 6 @@ -1038,23 +1038,23 @@ VisualTest { } Frame { msec: 3088 - hash: "ac4898002fdc5ea7894d741cac863c8d" + hash: "996da2eff9302908a55308dbcc8fb3c2" } Frame { msec: 3104 - hash: "eda67cb2d32f3f605a74a01148f04c99" + hash: "6ccc70f6120acb53152b71bcf95514ca" } Frame { msec: 3120 - hash: "13e84656ef70bf07e2a444d60ac933e1" + hash: "51a1b8e79d209643d55d4cecc6a70ed0" } Frame { msec: 3136 - hash: "9d624eebe5824fc5d4a89a04f2d776a3" + hash: "944dc7026c6487838ede9ef94003ec90" } Frame { msec: 3152 - hash: "2c7d542f60c68e16377d3c5afea0f4e3" + hash: "4abbd51b620ac4ea91af95bc2d0881d7" } Key { type: 7 @@ -1066,27 +1066,27 @@ VisualTest { } Frame { msec: 3168 - hash: "7db8d678bd1890010b2a1b9bb732c17c" + hash: "ba721988a1708b8c0762d706820c48fc" } Frame { msec: 3184 - hash: "6d6f4cc1193b73c65db893c3f983d9f0" + hash: "5dba56a5bb5f8a6539a0066af35c73b8" } Frame { msec: 3200 - hash: "d4e8985ad4d14436a87db45585fca946" + hash: "bc3efeeebe7075cd09a6e57eef43d610" } Frame { msec: 3216 - hash: "495b67926e9002a43e2d251b8c96564f" + hash: "0bd9f7de32b01d8144280bf252d9a18f" } Frame { msec: 3232 - hash: "3b2dd937cfb6cd57884f3b813f3d4129" + hash: "29db710e47b13f26e2bf92568d52bf52" } Frame { msec: 3248 - hash: "02a5902af43990021465a7df9d479982" + hash: "a27c65c0a49deb18b0766bba41a32e54" } Key { type: 6 @@ -1098,31 +1098,31 @@ VisualTest { } Frame { msec: 3264 - hash: "5b14b471fffa401affc954871662e6a8" + hash: "484ee552e1a9c5eafcfe1ac583fcdffd" } Frame { msec: 3280 - hash: "bbe03a2ea1e5b788c79d9551bd317a2d" + hash: "40b336a0e337b66d813089a82a88c712" } Frame { msec: 3296 - hash: "10b49692f820311b8bfbc0f87c05e993" + hash: "b7a8d4b8bb2b83e4c886aa51c1a73895" } Frame { msec: 3312 - hash: "928ee5d4ca3c31a879f82b5b4f6d1912" + hash: "43b3bf8425e7a6b7115d8e6a0bcfd677" } Frame { msec: 3328 - hash: "9f3ea4149963d467be28fcf26a43e6d6" + hash: "e2ce168241b043db74867fe7ed6de956" } Frame { msec: 3344 - hash: "f2ec87d7c4f6bbecc771270062e25d14" + hash: "0c713bbd7bb694d87f0fe14f87098b9b" } Frame { msec: 3360 - hash: "f181b9aeccdecd486550c2a69e57a63f" + hash: "316f6bd365ca4b4f2e6fbf34a047e307" } Key { type: 7 @@ -1134,39 +1134,39 @@ VisualTest { } Frame { msec: 3376 - hash: "ce871b1784464b56728eeb0140ad689c" + hash: "421fb8881fe7b300dcec0f44ff1743e3" } Frame { msec: 3392 - hash: "8d1b19921c7ee633f423b3f8c1f07e6a" + hash: "e8376079434393467b47a56ff00efb2b" } Frame { msec: 3408 - hash: "451973c72f86fc3425c31da3311d625c" + hash: "63259de84a6e07d42c9df94ec2a25920" } Frame { msec: 3424 - hash: "64301801af58f7a9c5ea32c33eb988e2" + hash: "f9194d82b81f5ac58862c382caf5cf59" } Frame { msec: 3440 - hash: "3406ff52f3829c56ff3b29558d6fd11c" + hash: "e185f2594f038532a37b351384dc97ea" } Frame { msec: 3456 - hash: "0952802094d7d7f105d7f50f36c02530" + hash: "91edc3ca1e6c532bd92006a761073da2" } Frame { msec: 3472 - hash: "daddc3aa8ae9970cc111e981adcdd9bb" + hash: "b47390495539756048ccc71047ebef7b" } Frame { msec: 3488 - hash: "491e3241705cdc2917c6560cece6188e" + hash: "7c83d3bdb9abf8ab2cfe7f9464673a49" } Frame { msec: 3504 - hash: "cefbdc87c704e72145e878fc944c621f" + hash: "b686f4013f45885ab794aba9ff491286" } Key { type: 7 @@ -1178,11 +1178,11 @@ VisualTest { } Frame { msec: 3520 - hash: "3427e88f200a1ac2d4596cb2fec0ae66" + hash: "0c55d6ea330b7365825864d4bdacafcb" } Frame { msec: 3536 - hash: "62eef650b45f3c2fa425d1bff88a01a7" + hash: "2bb72f191201572308e461021872fb4c" } Key { type: 7 @@ -1194,75 +1194,75 @@ VisualTest { } Frame { msec: 3552 - hash: "9945cda3cf5c22d8c83b19b0f69e4e09" + hash: "81b04a84982698ee80d13d392742edd3" } Frame { msec: 3568 - hash: "80fcd1194d1bc3e010ddc6ba224f3d40" + hash: "63f582dc2a9f707c1ec99f4285d13a84" } Frame { msec: 3584 - hash: "59da897870a7e235a67defaff1f8f4e4" + hash: "f91cb29101f80f5dcb1e9e8c82e823b7" } Frame { msec: 3600 - hash: "664bef152c87b3eb6729d9b46bad750c" + hash: "fdf68e988b988d068ea78a5a09ef349e" } Frame { msec: 3616 - hash: "7f422b624488525aede06c69996fc583" + hash: "27434828de3ba8f6a3b83f042b70eb8b" } Frame { msec: 3632 - hash: "235d20a347a0f7b331e707ad7de93f95" + hash: "e54102edbf6cc0c9a32b09858f760ee5" } Frame { msec: 3648 - hash: "836f9f207d8197f8e6e8e9c49f83aa4e" + hash: "26530bded6311640c4d3f6d1485fa7d3" } Frame { msec: 3664 - hash: "bbe9837039b7ea1dfab8ed30c8a15724" + hash: "eaee6483a2a4a0b09a8e40bb1785a498" } Frame { msec: 3680 - hash: "c5d26cd3ac3f87c77d716b912875b9de" + hash: "e1c083d0235ff5a2e002ce78f43009b0" } Frame { msec: 3696 - hash: "bc250ab3f5da66ecb0792a796b197149" + hash: "7f2ac0854ddbcca94a2ad160ead5d4d3" } Frame { msec: 3712 - hash: "c9fbfb63e19d1281b0c3a59504cd695c" + hash: "30c4aa33a6672f4df24186ad1e28bcf9" } Frame { msec: 3728 - hash: "e6ab11dfb1965e94f5a42f2642ca0b30" + hash: "38f16a7deeaea6828edd15b00024fc19" } Frame { msec: 3744 - hash: "abdd589312402caea0b1c4f26ff6a1bf" + hash: "bb74f706477e277284fad50752f078b5" } Frame { msec: 3760 - hash: "3d89454f0af4ab88ea67a075cb4e39b7" + hash: "a588e9dbeabd7519cd0cf2d26a123529" } Frame { msec: 3776 - hash: "3a90bb8b912d0be07e0e8b78407c54ff" + hash: "4fd9f22ad06e02b68319c298c2286e36" } Frame { msec: 3792 - hash: "4fa61e0644ce0942a30f05ad8d3f13f6" + hash: "29a28a97fc78a1b01252b852fb0446e2" } Frame { msec: 3808 - hash: "3c7588de81cbfbba8735da74de220128" + hash: "458895f9ede4d56e0b851c6ed124405d" } Frame { msec: 3824 - hash: "29277da2d1d6251e18ab89331d5df61d" + hash: "cd58c0d4f7248315a787542b0edcb4fb" } Frame { msec: 3840 @@ -1270,239 +1270,239 @@ VisualTest { } Frame { msec: 3856 - hash: "b6c660ffd14bb756f87adb5cf836e97f" + hash: "483eca22c50750e7591785ed60813d1f" } Frame { msec: 3872 - hash: "9e770dcd2f33ad157e86d08752458daf" + hash: "c5199c908df1f550d7c4f133eb926134" } Frame { msec: 3888 - hash: "4c9421ff4dc80e555ac5ba4a02d0c5be" + hash: "efaa5e4483ed9cfec792e8f270b5079e" } Frame { msec: 3904 - hash: "dcbfc9f6300363d03aa869ce3d58e6fe" + hash: "7ffcff87e27dcb0be0047eb6fbcc9549" } Frame { msec: 3920 - hash: "491f07f2498598cf57b368ff880f85f5" + hash: "04339417259ddee10134e1479729ae1b" } Frame { msec: 3936 - hash: "ea356dc3ef6aa6ca67e58b7b2f6912e4" + hash: "0f1e6a0d9db7b6b8b874333682866ffa" } Frame { msec: 3952 - hash: "8575a99b28bb5b8c2d01a5ed91f25d47" + hash: "66500c2cc3d69b9fb48dc46e384aca6d" } Frame { msec: 3968 - hash: "7f83ba29fd27aa4817b7b84afbc8d6d7" + hash: "70d6b73499c36138bee63e07afb0b186" } Frame { msec: 3984 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4000 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4016 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4032 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4048 - hash: "0173dd60a64da4c06fa9a398d2c98206" + hash: "c526315dd5eec117266c68a7b6b64a3f" } Frame { msec: 4064 - hash: "7f83ba29fd27aa4817b7b84afbc8d6d7" + hash: "70d6b73499c36138bee63e07afb0b186" } Frame { msec: 4080 - hash: "8575a99b28bb5b8c2d01a5ed91f25d47" + hash: "66500c2cc3d69b9fb48dc46e384aca6d" } Frame { msec: 4096 - hash: "ea356dc3ef6aa6ca67e58b7b2f6912e4" + hash: "0f1e6a0d9db7b6b8b874333682866ffa" } Frame { msec: 4112 - hash: "491f07f2498598cf57b368ff880f85f5" + hash: "04339417259ddee10134e1479729ae1b" } Frame { msec: 4128 - hash: "dcbfc9f6300363d03aa869ce3d58e6fe" + hash: "7ffcff87e27dcb0be0047eb6fbcc9549" } Frame { msec: 4144 - hash: "4c9421ff4dc80e555ac5ba4a02d0c5be" + hash: "efaa5e4483ed9cfec792e8f270b5079e" } Frame { msec: 4160 - hash: "9e770dcd2f33ad157e86d08752458daf" + hash: "c5199c908df1f550d7c4f133eb926134" } Frame { msec: 4176 - hash: "b6c660ffd14bb756f87adb5cf836e97f" + hash: "483eca22c50750e7591785ed60813d1f" } Frame { msec: 4192 - hash: "c498c154fcf2d66fc0981150e575033c" + hash: "4091de379d8f6ccc7f19ea39f6c7993a" } Frame { msec: 4208 - hash: "29277da2d1d6251e18ab89331d5df61d" + hash: "cd58c0d4f7248315a787542b0edcb4fb" } Frame { msec: 4224 - hash: "3c7588de81cbfbba8735da74de220128" + hash: "458895f9ede4d56e0b851c6ed124405d" } Frame { msec: 4240 - hash: "4fa61e0644ce0942a30f05ad8d3f13f6" + hash: "29a28a97fc78a1b01252b852fb0446e2" } Frame { msec: 4256 - hash: "3a90bb8b912d0be07e0e8b78407c54ff" + hash: "4fd9f22ad06e02b68319c298c2286e36" } Frame { msec: 4272 - hash: "3d89454f0af4ab88ea67a075cb4e39b7" + hash: "a588e9dbeabd7519cd0cf2d26a123529" } Frame { msec: 4288 - hash: "abdd589312402caea0b1c4f26ff6a1bf" + hash: "bb74f706477e277284fad50752f078b5" } Frame { msec: 4304 - hash: "e6ab11dfb1965e94f5a42f2642ca0b30" + hash: "38f16a7deeaea6828edd15b00024fc19" } Frame { msec: 4320 - hash: "c9fbfb63e19d1281b0c3a59504cd695c" + hash: "30c4aa33a6672f4df24186ad1e28bcf9" } Frame { msec: 4336 - hash: "bc250ab3f5da66ecb0792a796b197149" + hash: "7f2ac0854ddbcca94a2ad160ead5d4d3" } Frame { msec: 4352 - hash: "c5d26cd3ac3f87c77d716b912875b9de" + hash: "e1c083d0235ff5a2e002ce78f43009b0" } Frame { msec: 4368 - hash: "bbe9837039b7ea1dfab8ed30c8a15724" + hash: "eaee6483a2a4a0b09a8e40bb1785a498" } Frame { msec: 4384 - hash: "836f9f207d8197f8e6e8e9c49f83aa4e" + hash: "26530bded6311640c4d3f6d1485fa7d3" } Frame { msec: 4400 - hash: "235d20a347a0f7b331e707ad7de93f95" + hash: "e54102edbf6cc0c9a32b09858f760ee5" } Frame { msec: 4416 - hash: "7f422b624488525aede06c69996fc583" + hash: "27434828de3ba8f6a3b83f042b70eb8b" } Frame { msec: 4432 - hash: "664bef152c87b3eb6729d9b46bad750c" + hash: "fdf68e988b988d068ea78a5a09ef349e" } Frame { msec: 4448 - hash: "59da897870a7e235a67defaff1f8f4e4" + hash: "f91cb29101f80f5dcb1e9e8c82e823b7" } Frame { msec: 4464 - hash: "80fcd1194d1bc3e010ddc6ba224f3d40" + hash: "63f582dc2a9f707c1ec99f4285d13a84" } Frame { msec: 4480 - hash: "9945cda3cf5c22d8c83b19b0f69e4e09" + hash: "81b04a84982698ee80d13d392742edd3" } Frame { msec: 4496 - hash: "62eef650b45f3c2fa425d1bff88a01a7" + hash: "2bb72f191201572308e461021872fb4c" } Frame { msec: 4512 - hash: "3427e88f200a1ac2d4596cb2fec0ae66" + hash: "0c55d6ea330b7365825864d4bdacafcb" } Frame { msec: 4528 - hash: "cefbdc87c704e72145e878fc944c621f" + hash: "b686f4013f45885ab794aba9ff491286" } Frame { msec: 4544 - hash: "491e3241705cdc2917c6560cece6188e" + hash: "7c83d3bdb9abf8ab2cfe7f9464673a49" } Frame { msec: 4560 - hash: "daddc3aa8ae9970cc111e981adcdd9bb" + hash: "b47390495539756048ccc71047ebef7b" } Frame { msec: 4576 - hash: "0952802094d7d7f105d7f50f36c02530" + hash: "91edc3ca1e6c532bd92006a761073da2" } Frame { msec: 4592 - hash: "3406ff52f3829c56ff3b29558d6fd11c" + hash: "e185f2594f038532a37b351384dc97ea" } Frame { msec: 4608 - hash: "64301801af58f7a9c5ea32c33eb988e2" + hash: "f9194d82b81f5ac58862c382caf5cf59" } Frame { msec: 4624 - hash: "451973c72f86fc3425c31da3311d625c" + hash: "63259de84a6e07d42c9df94ec2a25920" } Frame { msec: 4640 - hash: "8d1b19921c7ee633f423b3f8c1f07e6a" + hash: "e8376079434393467b47a56ff00efb2b" } Frame { msec: 4656 - hash: "ce871b1784464b56728eeb0140ad689c" + hash: "421fb8881fe7b300dcec0f44ff1743e3" } Frame { msec: 4672 - hash: "f181b9aeccdecd486550c2a69e57a63f" + hash: "316f6bd365ca4b4f2e6fbf34a047e307" } Frame { msec: 4688 - hash: "f2ec87d7c4f6bbecc771270062e25d14" + hash: "0c713bbd7bb694d87f0fe14f87098b9b" } Frame { msec: 4704 - hash: "9f3ea4149963d467be28fcf26a43e6d6" + hash: "e2ce168241b043db74867fe7ed6de956" } Frame { msec: 4720 - hash: "928ee5d4ca3c31a879f82b5b4f6d1912" + hash: "43b3bf8425e7a6b7115d8e6a0bcfd677" } Frame { msec: 4736 - hash: "10b49692f820311b8bfbc0f87c05e993" + hash: "b7a8d4b8bb2b83e4c886aa51c1a73895" } Frame { msec: 4752 - hash: "bbe03a2ea1e5b788c79d9551bd317a2d" + hash: "40b336a0e337b66d813089a82a88c712" } Frame { msec: 4768 - hash: "5b14b471fffa401affc954871662e6a8" + hash: "484ee552e1a9c5eafcfe1ac583fcdffd" } Frame { msec: 4784 - hash: "02a5902af43990021465a7df9d479982" + hash: "a27c65c0a49deb18b0766bba41a32e54" } Frame { msec: 4800 @@ -1510,42 +1510,42 @@ VisualTest { } Frame { msec: 4816 - hash: "495b67926e9002a43e2d251b8c96564f" + hash: "0bd9f7de32b01d8144280bf252d9a18f" } Frame { msec: 4832 - hash: "d4e8985ad4d14436a87db45585fca946" + hash: "bc3efeeebe7075cd09a6e57eef43d610" } Frame { msec: 4848 - hash: "6d6f4cc1193b73c65db893c3f983d9f0" + hash: "5dba56a5bb5f8a6539a0066af35c73b8" } Frame { msec: 4864 - hash: "7db8d678bd1890010b2a1b9bb732c17c" + hash: "ba721988a1708b8c0762d706820c48fc" } Frame { msec: 4880 - hash: "2c7d542f60c68e16377d3c5afea0f4e3" + hash: "4abbd51b620ac4ea91af95bc2d0881d7" } Frame { msec: 4896 - hash: "9d624eebe5824fc5d4a89a04f2d776a3" + hash: "944dc7026c6487838ede9ef94003ec90" } Frame { msec: 4912 - hash: "13e84656ef70bf07e2a444d60ac933e1" + hash: "51a1b8e79d209643d55d4cecc6a70ed0" } Frame { msec: 4928 - hash: "eda67cb2d32f3f605a74a01148f04c99" + hash: "6ccc70f6120acb53152b71bcf95514ca" } Frame { msec: 4944 - hash: "ac4898002fdc5ea7894d741cac863c8d" + hash: "996da2eff9302908a55308dbcc8fb3c2" } Frame { msec: 4960 - hash: "2e95c1966c94acccd2a44a6c2942d36d" + hash: "264f34128dfe563126b9f187c65df61e" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png Binary files differindex a4d7bef..57a1599 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png Binary files differindex a8aee18..d327d5b 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png Binary files differindex 799f422..c1e3dce 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml index bbeb532..9a26f57 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.qml @@ -6,11 +6,11 @@ VisualTest { } Frame { msec: 16 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 32 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Key { type: 6 @@ -22,83 +22,83 @@ VisualTest { } Frame { msec: 48 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 64 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 80 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 96 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 112 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 128 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 144 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 160 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 176 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 192 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 208 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 224 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 240 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 256 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 272 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 288 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 304 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 320 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 336 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Frame { msec: 352 - hash: "3ea9888b1213bb799bdb01ed0eff2a78" + hash: "0e7c7dc19aab217751411568b58830ef" } Key { type: 6 @@ -110,23 +110,23 @@ VisualTest { } Frame { msec: 368 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 384 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 400 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 416 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 432 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Key { type: 7 @@ -138,27 +138,27 @@ VisualTest { } Frame { msec: 448 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 464 - hash: "d070b6581fd109ce278cf4a8c41a6549" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 480 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 496 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 512 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 528 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Key { type: 7 @@ -170,43 +170,43 @@ VisualTest { } Frame { msec: 544 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 560 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 576 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 592 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 608 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 624 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 640 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 656 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 672 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Frame { msec: 688 - hash: "6a80a729e85f8dab98155e115a4193cc" + hash: "d3151ba24f0011bf1add83377f32ec85" } Key { type: 6 @@ -218,23 +218,23 @@ VisualTest { } Frame { msec: 704 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 720 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 736 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 752 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 768 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Key { type: 7 @@ -246,23 +246,23 @@ VisualTest { } Frame { msec: 784 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 800 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 816 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 832 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Frame { msec: 848 - hash: "fd47d9eaea89d6a731bdd70b39b2bc54" + hash: "6b7c333ce19fede43aee84cc66c4c1bc" } Key { type: 6 @@ -274,15 +274,15 @@ VisualTest { } Frame { msec: 864 - hash: "b643c026fe7570505e72971d3b3f0ea2" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Frame { msec: 880 - hash: "b643c026fe7570505e72971d3b3f0ea2" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Frame { msec: 896 - hash: "b643c026fe7570505e72971d3b3f0ea2" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Key { type: 7 @@ -294,15 +294,15 @@ VisualTest { } Frame { msec: 912 - hash: "b643c026fe7570505e72971d3b3f0ea2" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Frame { msec: 928 - hash: "b643c026fe7570505e72971d3b3f0ea2" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Frame { msec: 944 - hash: "b643c026fe7570505e72971d3b3f0ea2" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Frame { msec: 960 @@ -310,7 +310,7 @@ VisualTest { } Frame { msec: 976 - hash: "cba83dfcd44e4ba3ea44dd8d84bde745" + hash: "a5386e9b39daa0a5aad8a8cd5191909b" } Key { type: 6 @@ -322,19 +322,19 @@ VisualTest { } Frame { msec: 992 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1008 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1024 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1040 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Key { type: 7 @@ -346,51 +346,51 @@ VisualTest { } Frame { msec: 1056 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1072 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1088 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1104 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1120 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1136 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1152 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1168 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1184 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1200 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1216 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Frame { msec: 1232 - hash: "bca450bd2b1a46da72e0ba99a70c18ab" + hash: "f9149723166015ed066b794cf86b27d0" } Key { type: 6 @@ -402,15 +402,15 @@ VisualTest { } Frame { msec: 1248 - hash: "55c33f786e6dc14b038dba96cc154859" + hash: "56dd8557435509e5a96c2f2907d474eb" } Frame { msec: 1264 - hash: "55c33f786e6dc14b038dba96cc154859" + hash: "56dd8557435509e5a96c2f2907d474eb" } Frame { msec: 1280 - hash: "55c33f786e6dc14b038dba96cc154859" + hash: "56dd8557435509e5a96c2f2907d474eb" } Key { type: 7 @@ -422,15 +422,15 @@ VisualTest { } Frame { msec: 1296 - hash: "55c33f786e6dc14b038dba96cc154859" + hash: "56dd8557435509e5a96c2f2907d474eb" } Frame { msec: 1312 - hash: "55c33f786e6dc14b038dba96cc154859" + hash: "56dd8557435509e5a96c2f2907d474eb" } Frame { msec: 1328 - hash: "55c33f786e6dc14b038dba96cc154859" + hash: "56dd8557435509e5a96c2f2907d474eb" } Key { type: 6 @@ -442,39 +442,39 @@ VisualTest { } Frame { msec: 1344 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1360 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1376 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1392 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1408 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1424 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1440 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1456 - hash: "693d9e7579752a748d4c8d7fcbd3c022" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Frame { msec: 1472 - hash: "9be278fc6ebef108857a414ecb292b46" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Key { type: 7 @@ -486,7 +486,7 @@ VisualTest { } Frame { msec: 1488 - hash: "9be278fc6ebef108857a414ecb292b46" + hash: "b311772a9bf92f4222b1c1c7ddbe96c4" } Key { type: 6 @@ -498,19 +498,19 @@ VisualTest { } Frame { msec: 1504 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1520 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1536 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1552 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Key { type: 7 @@ -522,27 +522,27 @@ VisualTest { } Frame { msec: 1568 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1584 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1600 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1616 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1632 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Frame { msec: 1648 - hash: "b1c799fd9f4ebf097ec79448eb9b4a2c" + hash: "8feb240ad13e1e9d8392bfeb484261db" } Key { type: 6 @@ -554,23 +554,23 @@ VisualTest { } Frame { msec: 1664 - hash: "46e977b7614ae6316a64106f6e5326c1" + hash: "cd240ccffd4b4a6304b47cfd1e55cf49" } Frame { msec: 1680 - hash: "46e977b7614ae6316a64106f6e5326c1" + hash: "cd240ccffd4b4a6304b47cfd1e55cf49" } Frame { msec: 1696 - hash: "46e977b7614ae6316a64106f6e5326c1" + hash: "cd240ccffd4b4a6304b47cfd1e55cf49" } Frame { msec: 1712 - hash: "46e977b7614ae6316a64106f6e5326c1" + hash: "cd240ccffd4b4a6304b47cfd1e55cf49" } Frame { msec: 1728 - hash: "46e977b7614ae6316a64106f6e5326c1" + hash: "cd240ccffd4b4a6304b47cfd1e55cf49" } Key { type: 6 @@ -582,7 +582,7 @@ VisualTest { } Frame { msec: 1744 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Key { type: 7 @@ -594,15 +594,15 @@ VisualTest { } Frame { msec: 1760 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Frame { msec: 1776 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Frame { msec: 1792 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Key { type: 7 @@ -614,19 +614,19 @@ VisualTest { } Frame { msec: 1808 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Frame { msec: 1824 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Frame { msec: 1840 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Frame { msec: 1856 - hash: "2d7771008d9ec265f70d089bb8436e18" + hash: "437370a412fccbeee3d1f095e32c3584" } Key { type: 6 @@ -638,15 +638,15 @@ VisualTest { } Frame { msec: 1872 - hash: "7d85b2d311514db5988e335110fb8352" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 1888 - hash: "7d85b2d311514db5988e335110fb8352" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 1904 - hash: "7d85b2d311514db5988e335110fb8352" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 1920 @@ -662,27 +662,27 @@ VisualTest { } Frame { msec: 1936 - hash: "7d85b2d311514db5988e335110fb8352" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 1952 - hash: "7d85b2d311514db5988e335110fb8352" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 1968 - hash: "7d85b2d311514db5988e335110fb8352" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 1984 - hash: "9f4258905e76a6523e015701c3278cae" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 2000 - hash: "9f4258905e76a6523e015701c3278cae" + hash: "eb4a45722e365b103ff5423117236fd3" } Frame { msec: 2016 - hash: "9f4258905e76a6523e015701c3278cae" + hash: "eb4a45722e365b103ff5423117236fd3" } Key { type: 6 @@ -694,11 +694,11 @@ VisualTest { } Frame { msec: 2032 - hash: "8a2cf6f27a40da75be9d9bcf88b4c022" + hash: "b53d0651627d008545e54063ceb8d689" } Frame { msec: 2048 - hash: "8a2cf6f27a40da75be9d9bcf88b4c022" + hash: "b53d0651627d008545e54063ceb8d689" } Key { type: 7 @@ -710,11 +710,11 @@ VisualTest { } Frame { msec: 2064 - hash: "8a2cf6f27a40da75be9d9bcf88b4c022" + hash: "b53d0651627d008545e54063ceb8d689" } Frame { msec: 2080 - hash: "8a2cf6f27a40da75be9d9bcf88b4c022" + hash: "b53d0651627d008545e54063ceb8d689" } Key { type: 6 @@ -726,19 +726,19 @@ VisualTest { } Frame { msec: 2096 - hash: "6c679da9b822fefef626c4308fdc9080" + hash: "173b36137940b37001750e02d434b8e8" } Frame { msec: 2112 - hash: "6c679da9b822fefef626c4308fdc9080" + hash: "173b36137940b37001750e02d434b8e8" } Frame { msec: 2128 - hash: "6c679da9b822fefef626c4308fdc9080" + hash: "173b36137940b37001750e02d434b8e8" } Frame { msec: 2144 - hash: "6c679da9b822fefef626c4308fdc9080" + hash: "173b36137940b37001750e02d434b8e8" } Key { type: 6 @@ -758,19 +758,19 @@ VisualTest { } Frame { msec: 2160 - hash: "81399b2d1ffa0a097f9d0eea0ccf26a5" + hash: "2e636a964b4a1ab74ad3e23399c2ae8c" } Frame { msec: 2176 - hash: "81399b2d1ffa0a097f9d0eea0ccf26a5" + hash: "2e636a964b4a1ab74ad3e23399c2ae8c" } Frame { msec: 2192 - hash: "81399b2d1ffa0a097f9d0eea0ccf26a5" + hash: "2e636a964b4a1ab74ad3e23399c2ae8c" } Frame { msec: 2208 - hash: "81399b2d1ffa0a097f9d0eea0ccf26a5" + hash: "2e636a964b4a1ab74ad3e23399c2ae8c" } Key { type: 6 @@ -782,7 +782,7 @@ VisualTest { } Frame { msec: 2224 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Key { type: 7 @@ -794,23 +794,23 @@ VisualTest { } Frame { msec: 2240 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Frame { msec: 2256 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Frame { msec: 2272 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Frame { msec: 2288 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Frame { msec: 2304 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Key { type: 7 @@ -822,11 +822,11 @@ VisualTest { } Frame { msec: 2320 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Frame { msec: 2336 - hash: "aebfaf936f9c4e0f856a2a2d1b2014ee" + hash: "631c6034372c2e7675ebce0ec415f230" } Key { type: 6 @@ -838,27 +838,27 @@ VisualTest { } Frame { msec: 2352 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2368 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2384 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2400 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2416 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2432 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Key { type: 7 @@ -870,19 +870,19 @@ VisualTest { } Frame { msec: 2448 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2464 - hash: "1e9d2117d8392ea494d28f95ddb57213" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2480 - hash: "a016e70b0f98846694ef3ae906faa346" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Frame { msec: 2496 - hash: "a016e70b0f98846694ef3ae906faa346" + hash: "ea5c3cdde73009e1bd46e71e4cc3bf0f" } Key { type: 6 @@ -894,15 +894,15 @@ VisualTest { } Frame { msec: 2512 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2528 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2544 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Key { type: 7 @@ -914,83 +914,83 @@ VisualTest { } Frame { msec: 2560 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2576 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2592 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2608 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2624 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2640 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2656 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2672 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2688 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2704 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2720 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2736 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2752 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2768 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2784 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2800 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2816 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2832 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2848 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2864 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2880 @@ -998,46 +998,46 @@ VisualTest { } Frame { msec: 2896 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2912 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2928 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2944 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2960 - hash: "818ad2e56a73599ae69ce5000d5b278f" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2976 - hash: "147568112e60545f440f2109f918a59e" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 2992 - hash: "147568112e60545f440f2109f918a59e" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 3008 - hash: "147568112e60545f440f2109f918a59e" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 3024 - hash: "147568112e60545f440f2109f918a59e" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 3040 - hash: "147568112e60545f440f2109f918a59e" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } Frame { msec: 3056 - hash: "147568112e60545f440f2109f918a59e" + hash: "91ef7f08d8fec2e0d353b1bf5da99c41" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml index fb56da6..4c402ea 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/hAlign.qml @@ -6,102 +6,102 @@ VisualTest { } Frame { msec: 16 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 32 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 48 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 64 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 80 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 96 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 112 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 128 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 144 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 160 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 176 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 192 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 208 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 224 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 240 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 256 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 272 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 288 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 304 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 320 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 336 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 352 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 368 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 384 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } Frame { msec: 400 - hash: "15c91702a80de73ac1abc3db9fa8ca09" + hash: "840c5f54c105f90c7b0c2254fee2e434" } } diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml index ad8db33..f36a752 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/hAlign.qml @@ -6,35 +6,35 @@ Item{ height:300; Column { //Because they have auto width, these three should look the same - TestTextInput { - text: "Jackdaws love my big sphinx of quartz"; + TestTextInput { + text: "Jackdaws love my big sphinx of quartz"; horizontalAlignment: TextInput.AlignLeft; } - TestTextInput { - text: "Jackdaws love my big sphinx of quartz"; + TestTextInput { + text: "Jackdaws love my big sphinx of quartz"; horizontalAlignment: TextInput.AlignHCenter; } - TestTextInput { - text: "Jackdaws love my big sphinx of quartz"; + TestTextInput { + text: "Jackdaws love my big sphinx of quartz"; horizontalAlignment: TextInput.AlignRight; } Rectangle{ width: 600; height: 10; color: "pink" } - TestTextInput { + TestTextInput { height: 30; width: 600; - text: "Jackdaws love my big sphinx of quartz"; + text: "Jackdaws love my big sphinx of quartz"; horizontalAlignment: TextInput.AlignLeft; } - TestTextInput { + TestTextInput { height: 30; width: 600; - text: "Jackdaws love my big sphinx of quartz"; + text: "Jackdaws love my big sphinx of quartz"; horizontalAlignment: TextInput.AlignHCenter; } - TestTextInput { + TestTextInput { height: 30; width: 600; - text: "Jackdaws love my big sphinx of quartz"; + text: "Jackdaws love my big sphinx of quartz"; horizontalAlignment: TextInput.AlignRight; } } diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml index fb35ae3..e19e418 100644 --- a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml +++ b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml @@ -7,7 +7,7 @@ TextEdit { font.family: fixedFont.name font.pixelSize: 12 cursorDelegate: Rectangle { - width: 1; + width: 1; color: "black"; visible: edit.cursorVisible } diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml index 8593218..e01c2c2 100644 --- a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml +++ b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml @@ -7,7 +7,7 @@ TextInput { font.family: fixedFont.name font.pixelSize: 12 cursorDelegate: Rectangle { - width: 1; + width: 1; color: "black"; visible: parent.cursorVisible//bug that 'inp' doesn't seem to work? } diff --git a/tests/auto/platformquirks.h b/tests/auto/platformquirks.h new file mode 100644 index 0000000..06d23d7 --- /dev/null +++ b/tests/auto/platformquirks.h @@ -0,0 +1,122 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef PLATFORMQUIRKS_H +#define PLATFORMQUIRKS_H + +#include <qglobal.h> + +#ifdef QT_GUI_LIB +#include <qapplication.h> +#endif + +#ifdef Q_WS_X11 +#include <private/qt_x11_p.h> +#endif + +struct PlatformQuirks +{ + enum MediaFileTypes + { + mp3, + wav, + ogg + }; + + /* On some platforms, libpng or libjpeg sacrifice precision for speed. + Esp. with NEON support, color values after decoding can be off by up + to three bytes. + */ + static inline bool isImageLoaderImprecise() + { +#ifdef Q_WS_MAEMO_5 + return true; +#elif defined(Q_WS_X11) + // ### this is a very bad assumption, we should really check the version of libjpeg + return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR; +#else + return false; +#endif + } + + /* Some windowing systems automatically maximize apps on startup (e.g. Maemo) + "Normal" fixed-sized windows do not work, the WM ignores their size settings. + */ + static inline bool isAutoMaximizing() + { +#ifdef Q_WS_MAEMO_5 + return true; +#elif defined(Q_WS_X11) + return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR; +#else + return false; +#endif + } + + static inline bool haveMouseCursor() + { +#ifdef Q_WS_MAEMO_5 + return false; +#elif defined(Q_WS_X11) + return X11->desktopEnvironment != DE_MEEGO_COMPOSITOR; +#else + return true; +#endif + } + + /* On some systems an ogg codec is not installed by default. + The autotests have to know which fileType is the default on the system*/ + static inline MediaFileTypes defaultMediaFileType() + { +#ifdef Q_WS_MAEMO_5 + return PlatformQuirks::mp3; +#endif +#ifdef Q_WS_X11 + // ### very bad assumption + if (X11->desktopEnvironment == DE_MEEGO_COMPOSITOR) + return PlatformQuirks::mp3; +#endif + return PlatformQuirks::ogg; + } +}; + +#endif + diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp index da83826..d6c4b53 100644 --- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -353,12 +353,13 @@ void tst_QAbstractScrollArea::task214488_layoutDirection() void tst_QAbstractScrollArea::patternBackground() { - QScrollArea scrollArea; + QWidget topLevel; + QScrollArea scrollArea(&topLevel); scrollArea.resize(200, 200); QWidget widget; widget.resize(600, 600); scrollArea.setWidget(&widget); - scrollArea.show(); + topLevel.show(); QLinearGradient linearGrad(QPointF(250, 250), QPointF(300, 300)); linearGrad.setColorAt(0, Qt::yellow); diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp index cf069db..cd41d05 100644 --- a/tests/auto/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp @@ -55,6 +55,8 @@ class Slider : public QAbstractSlider { public: + Slider(QWidget *parent) + : QAbstractSlider(parent) {} using QAbstractSlider::setRepeatAction; using QAbstractSlider::repeatAction; }; @@ -95,6 +97,7 @@ private slots: private: void waitUntilTimeElapsed(const QTime& t, int ms); + QWidget *topLevel; Slider *slider; int previousAction; int reportedMinimum; @@ -113,7 +116,8 @@ Q_DECLARE_METATYPE(QPoint) void tst_QAbstractSlider::initTestCase() { - slider = new Slider; + topLevel = new QWidget; + slider = new Slider(topLevel); slider->setObjectName("testWidget"); slider->resize(100,100); slider->show(); @@ -129,7 +133,7 @@ void tst_QAbstractSlider::initTestCase() void tst_QAbstractSlider::cleanupTestCase() { - delete slider; + delete topLevel; } void tst_QAbstractSlider::actionTriggered(int action) @@ -735,7 +739,6 @@ void tst_QAbstractSlider::wheelEvent_data() << 100 // expected position after #endif << QPoint(1,1); - QTest::newRow("Different orientation") << 0 // initial position << 0 // minimum << 100 // maximum @@ -774,7 +777,6 @@ void tst_QAbstractSlider::wheelEvent_data() #endif << QPoint(0,0); - QTest::newRow("Inverted controls") << 50 // initial position << 0 // minimum << 100 // maximum @@ -924,6 +926,7 @@ void tst_QAbstractSlider::sliderPressedReleased() QFETCH(uint, subControl); QFETCH(int, expectedCount); + QWidget topLevel; QAbstractSlider *slider; switch (control) { default: @@ -931,11 +934,11 @@ void tst_QAbstractSlider::sliderPressedReleased() return; break; case QStyle::CC_Slider: - slider = new QSlider; + slider = new QSlider(&topLevel); slider->setLayoutDirection(Qt::LeftToRight); // Makes "upside down" much easier to compute break; case QStyle::CC_ScrollBar: - slider = new QScrollBar; + slider = new QScrollBar(&topLevel); break; } @@ -949,7 +952,7 @@ void tst_QAbstractSlider::sliderPressedReleased() QSignalSpy spy2(slider, SIGNAL(sliderReleased())); // Mac Style requires the control to be active to get the correct values... - slider->show(); + topLevel.show(); slider->activateWindow(); QStyleOptionSlider option; diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index cea259c..21a530e 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -2269,6 +2269,7 @@ void tst_QAccessibility::scrollBarTest() delete scrollBarInterface; delete scrollBar; + // Test that the rects are ok. { QScrollBar *scrollBar = new QScrollBar(Qt::Horizontal); @@ -2289,7 +2290,6 @@ void tst_QAccessibility::scrollBarTest() const QRect scrollBarRect = scrollBarInterface->rect(0); QVERIFY(scrollBarRect.isValid()); - // Verify that the sub-control rects are valid and inside the scrollBar rect. for (int i = LineUp; i <= LineDown; ++i) { const QRect testRect = scrollBarInterface->rect(i); @@ -3469,14 +3469,15 @@ void tst_QAccessibility::tableWidgetTest() { #ifdef QTEST_ACCESSIBILITY { - QTableWidget *w = new QTableWidget(8,4); + QWidget *topLevel = new QWidget; + QTableWidget *w = new QTableWidget(8,4,topLevel); for (int r = 0; r < 8; ++r) { for (int c = 0; c < 4; ++c) { w->setItem(r, c, new QTableWidgetItem(tr("%1,%2").arg(c).arg(r))); } } w->resize(100, 100); - w->show(); + topLevel->show(); #if defined(Q_WS_X11) qt_x11_wait_for_window_manager(w); QTest::qWait(100); @@ -3503,6 +3504,7 @@ void tst_QAccessibility::tableWidgetTest() delete view; delete client; delete w; + delete topLevel; } QTestAccessibility::clearEvents(); #else diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp index c4acfdc..659f8a5 100644 --- a/tests/auto/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp @@ -198,7 +198,8 @@ void tst_QBoxLayout::sizeConstraints() void tst_QBoxLayout::setGeometry() { - QWidget w; + QWidget toplevel; + QWidget w(&toplevel); QVBoxLayout *lay = new QVBoxLayout; lay->setMargin(0); lay->setSpacing(0); @@ -209,7 +210,7 @@ void tst_QBoxLayout::setGeometry() lay2->setAlignment(Qt::AlignRight); lay->addLayout(lay2); w.setLayout(lay); - w.show(); + toplevel.show(); QRect newGeom(0, 0, 70, 70); lay2->setGeometry(newGeom); diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp index a610a7f..1831e5d 100644 --- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp @@ -396,19 +396,20 @@ void tst_QButtonGroup::task106609() vbox->addWidget(radio2); buttons->addButton(radio3, 3); vbox->addWidget(radio3); - - radio1->setFocus(); - radio1->setChecked(true); dlg.show(); + QTest::qWaitForWindowShown(&dlg); qRegisterMetaType<QAbstractButton*>("QAbstractButton*"); QSignalSpy spy1(buttons, SIGNAL(buttonClicked(QAbstractButton*))); QSignalSpy spy2(buttons, SIGNAL(buttonClicked(int))); - QTestEventLoop::instance().enterLoop(1); QApplication::setActiveWindow(&dlg); QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&dlg)); + radio1->setFocus(); + radio1->setChecked(true); + QTestEventLoop::instance().enterLoop(1); + //qDebug() << "int:" << spy2.count() << "QAbstractButton*:" << spy1.count(); QCOMPARE(spy2.count(), 2); QCOMPARE(spy1.count(), 2); diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp index 042d8e0..01473d8 100644 --- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp @@ -82,7 +82,8 @@ private slots: // Testing get/set functions void tst_QCalendarWidget::getSetCheck() { - QCalendarWidget object; + QWidget topLevel; + QCalendarWidget object(&topLevel); //horizontal header formats object.setHorizontalHeaderFormat(QCalendarWidget::NoHorizontalHeader); @@ -191,7 +192,7 @@ void tst_QCalendarWidget::buttonClickCheck() QCOMPARE(month, object.monthShown()); button = qFindChild<QToolButton *>(&object, "qt_calendar_yearbutton"); - QTest::mouseClick(button, Qt::LeftButton); + QTest::mouseClick(button, Qt::LeftButton, Qt::NoModifier, button->rect().center(), 2); QVERIFY(!button->isVisible()); QSpinBox *spinbox = qFindChild<QSpinBox *>(&object, "qt_calendar_yearedit"); QTest::qWait(500); diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp index 1da8c5d..d4caede 100644 --- a/tests/auto/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp @@ -398,9 +398,10 @@ void tst_QColumnView::scrollTo() QFETCH(bool, giveFocus); if (reverse) qApp->setLayoutDirection(Qt::RightToLeft); - ColumnView view; + QWidget topLevel; + ColumnView view(&topLevel); view.resize(200, 200); - view.show(); + topLevel.show(); view.scrollTo(QModelIndex(), QAbstractItemView::EnsureVisible); QCOMPARE(view.HorizontalOffset(), 0); @@ -428,6 +429,8 @@ void tst_QColumnView::scrollTo() view.setFocus(Qt::OtherFocusReason); else view.clearFocus(); + + qApp->processEvents(); QTRY_COMPARE(view.hasFocus(), giveFocus); // scroll to the right int level = 0; @@ -718,13 +721,14 @@ void tst_QColumnView::moveGrip() QFETCH(bool, reverse); if (reverse) qApp->setLayoutDirection(Qt::RightToLeft); - ColumnView view; + QWidget topLevel; + ColumnView view(&topLevel); TreeModel model; view.setModel(&model); QModelIndex home = model.thirdLevel(); view.setCurrentIndex(home); view.resize(640, 200); - view.show(); + topLevel.show(); QTest::qWait(ANIMATION_DELAY); int columnNum = view.createdColumns.count() - 2; @@ -741,9 +745,9 @@ void tst_QColumnView::moveGrip() QAbstractItemView *column = qobject_cast<QAbstractItemView *>(grip->parent()); int oldX = column->width(); - QCOMPARE(view.columnWidths()[columnNum], oldX); + QCOMPARE(view.columnWidths().value(columnNum), oldX); grip->moveGrip(10); - QCOMPARE(view.columnWidths()[columnNum], (oldX + (reverse ? -10 : 10))); + QCOMPARE(view.columnWidths().value(columnNum), (oldX + (reverse ? -10 : 10))); } void tst_QColumnView::doubleClick() @@ -889,12 +893,13 @@ void tst_QColumnView::rowDelegate() void tst_QColumnView::resize() { - ColumnView view; + QWidget topLevel; + ColumnView view(&topLevel); QDirModel model; view.setModel(&model); view.resize(200, 200); - view.show(); + topLevel.show(); QModelIndex home = model.index(QDir::homePath()).parent(); view.setCurrentIndex(home); QTest::qWait(ANIMATION_DELAY); diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 1fcea9e..9614e1e 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -163,7 +163,7 @@ protected slots: private: QComboBox *testWidget; - QDialog *parent; + QWidget *parent; QPushButton* ok; int editTextCount; QString editText; @@ -395,7 +395,7 @@ tst_QComboBox::~tst_QComboBox() void tst_QComboBox::initTestCase() { // Create the test class - parent = new QDialog(0); + parent = new QWidget(0, Qt::Window); parent->setObjectName("parent"); parent->resize(400, 400); testWidget = new QComboBox(parent); @@ -1914,7 +1914,8 @@ void tst_QComboBox::itemListPosition() //we test QFontComboBox because it has the specific behaviour to set a fixed size //to the list view - QFontComboBox combo; + QWidget topLevel; + QFontComboBox combo(&topLevel); //the code to get the avaialbe screen space is copied from QComboBox code const int scrNumber = QApplication::desktop()->screenNumber(&combo); @@ -1932,7 +1933,7 @@ void tst_QComboBox::itemListPosition() combo.move(screen.width()-combo.sizeHint().width(), 0); //puts the combo to the top-right corner - combo.show(); + topLevel.show(); //wait because the window manager can move the window if there is a right panel QTRY_VERIFY(combo.isVisible()); combo.showPopup(); @@ -2254,9 +2255,10 @@ void tst_QComboBox::noScrollbar() qApp->setStyleSheet(stylesheet); { - QComboBox comboBox; + QWidget topLevel; + QComboBox comboBox(&topLevel); comboBox.addItems(initialContent); - comboBox.show(); + topLevel.show(); comboBox.resize(200, comboBox.height()); QTRY_VERIFY(comboBox.isVisible()); comboBox.showPopup(); diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp index 8c2ffd9..8331a5f 100644 --- a/tests/auto/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/qeventloop/tst_qeventloop.cpp @@ -431,7 +431,7 @@ void tst_QEventLoop::exec() QCOMPARE(executor.returnCode, -1); } -#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM) && !defined(Q_OS_SYMBIAN) +#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_OS_WINCE_WM) && !defined(Q_OS_SYMBIAN) && !defined(NO_EVENTLOOP_EXCEPTIONS) // Windows Mobile cannot handle cross library exceptions // qobject.cpp will try to rethrow the exception after handling // which causes gwes.exe to crash diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 208110a..c9bf17a 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -70,6 +70,10 @@ # define SRCDIR "" #endif +QT_BEGIN_NAMESPACE +extern Q_AUTOTEST_EXPORT bool qIsLikelyToBeNfs(int /* handle */); +QT_END_NAMESPACE + //TESTED_CLASS= //TESTED_FILES= @@ -939,6 +943,10 @@ void tst_QFileInfo::fileTimes() QEXPECT_FAIL("longfile absolutepath", "Maximum total filepath cannot exceed 256 characters in Symbian", Abort); #endif QVERIFY(file.open(QFile::WriteOnly | QFile::Text)); +#ifdef Q_OS_UNIX + if (qIsLikelyToBeNfs(file.handle())) + QSKIP("This Test doesn't work on NFS", SkipAll); +#endif QTextStream ts(&file); ts << fileName << endl; } diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp index 07fa630..5315cd1 100644 --- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp @@ -51,6 +51,7 @@ #include "../../shared/util.h" #include <private/qgraphicseffect_p.h> +#include "../platformquirks.h" //TESTED_CLASS= //TESTED_FILES= @@ -710,7 +711,10 @@ void tst_QGraphicsEffect::prepareGeometryChangeInvalidateCache() scene.addItem(item); QGraphicsView view(&scene); - view.show(); + if(PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); QTRY_COMPARE(item->nbPaint, 1); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index a3bd0b0..0b29410 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -94,6 +94,8 @@ Q_DECLARE_METATYPE(QRectF) #define COMPARE_REGIONS QTRY_COMPARE #endif +#include "../platformquirks.h" + static QGraphicsRectItem staticItem; //QTBUG-7629, we should not crash at exit. static void sendMousePress(QGraphicsScene *scene, const QPointF &point, Qt::MouseButton button = Qt::LeftButton) @@ -272,7 +274,7 @@ class MyGraphicsView : public QGraphicsView public: int repaints; QRegion paintedRegion; - MyGraphicsView(QGraphicsScene *scene) : QGraphicsView(scene), repaints(0) {} + MyGraphicsView(QGraphicsScene *scene, QWidget *parent=0) : QGraphicsView(scene,parent), repaints(0) {} void paintEvent(QPaintEvent *e) { paintedRegion += e->region(); @@ -4070,9 +4072,10 @@ void tst_QGraphicsItem::cursor() item1->setCursor(Qt::IBeamCursor); item2->setCursor(Qt::PointingHandCursor); - QGraphicsView view(&scene); + QWidget topLevel; + QGraphicsView view(&scene,&topLevel); view.setFixedSize(200, 100); - view.show(); + topLevel.show(); QTest::mouseMove(&view, view.rect().center()); QTest::qWait(25); @@ -4094,6 +4097,8 @@ void tst_QGraphicsItem::cursor() QApplication::sendEvent(view.viewport(), &event); } + if (!PlatformQuirks::haveMouseCursor()) + return; #if !defined(Q_OS_WINCE) QTest::qWait(250); #else @@ -4959,7 +4964,10 @@ void tst_QGraphicsItem::paint() QGraphicsView view(&scene); - view.show(); + if(PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); QApplication::processEvents(); #ifdef Q_OS_WIN32 @@ -5975,9 +5983,10 @@ void tst_QGraphicsItem::untransformable() QGraphicsScene scene(-500, -500, 1000, 1000); scene.addItem(item1); - QGraphicsView view(&scene); + QWidget topLevel; + QGraphicsView view(&scene,&topLevel); view.resize(300, 300); - view.show(); + topLevel.show(); view.scale(8, 8); view.centerOn(0, 0); @@ -6616,7 +6625,10 @@ void tst_QGraphicsItem::opacity2() scene.addItem(parent); MyGraphicsView view(&scene); - view.show(); + if(PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); QTRY_VERIFY(view.repaints >= 1); @@ -7050,6 +7062,7 @@ void tst_QGraphicsItem::tabChangesFocus() widget.setLayout(layout); widget.show(); QTest::qWaitForWindowShown(&widget); + QTest::qWait(2000); QTRY_VERIFY(scene.isActive()); @@ -7495,9 +7508,11 @@ void tst_QGraphicsItem::update() { QGraphicsScene scene; scene.setSceneRect(-100, -100, 200, 200); - MyGraphicsView view(&scene); + QWidget topLevel; + MyGraphicsView view(&scene,&topLevel); - view.show(); + topLevel.resize(300, 300); + topLevel.show(); #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&view); #endif @@ -7776,10 +7791,11 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption() MyStyleOptionTester *rect = new MyStyleOptionTester(QRect(0, 0, 100, 100)); scene.addItem(rect); rect->setPos(200, 200); - QGraphicsView view(&scene); - view.setWindowFlags(Qt::X11BypassWindowManagerHint); + QWidget topLevel; + QGraphicsView view(&scene, &topLevel); + topLevel.setWindowFlags(Qt::X11BypassWindowManagerHint); rect->startTrack = false; - view.show(); + topLevel.show(); QTest::qWaitForWindowShown(&view); QTest::qWait(60); rect->startTrack = true; @@ -7980,6 +7996,9 @@ void tst_QGraphicsItem::sorting_data() void tst_QGraphicsItem::sorting() { + if (PlatformQuirks::isAutoMaximizing()) + QSKIP("Skipped because Platform is auto maximizing", SkipAll); + _paintedItems.clear(); QGraphicsScene scene; @@ -8015,7 +8034,7 @@ void tst_QGraphicsItem::sorting() _paintedItems.clear(); view.viewport()->repaint(); -#ifdef Q_WS_MAC +#if defined(Q_WS_MAC) // There's no difference between repaint and update on the Mac, // so we have to process events here to make sure we get the event. QTest::qWait(100); @@ -8114,10 +8133,13 @@ void tst_QGraphicsItem::hitTestGraphicsEffectItem() QGraphicsScene scene; scene.setSceneRect(-100, -100, 200, 200); - QGraphicsView view(&scene); - view.show(); + QWidget toplevel; + + QGraphicsView view(&scene, &toplevel); + toplevel.resize(300, 300); + toplevel.show(); #ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&view); + qt_x11_wait_for_window_manager(&toplevel); #endif QTest::qWait(100); @@ -10721,7 +10743,10 @@ void tst_QGraphicsItem::QTBUG_6738_missingUpdateWithSetParent() scene.addItem(parent); MyGraphicsView view(&scene); - view.show(); + if(PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); QTRY_VERIFY(view.repaints > 0); @@ -10769,7 +10794,10 @@ void tst_QGraphicsItem::QT_2653_fullUpdateDiscardingOpacityUpdate() // ItemIgnoresTransformations, ItemClipsChildrenToShape, ItemIsSelectable parentGreen->setFlag(QGraphicsItem::ItemIgnoresTransformations); - view.show(); + if (PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); view.reset(); @@ -10954,7 +10982,10 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene() item3->setParentItem(item2); item2->setParentItem(item); scene.addItem(item); - view.show(); + if(PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); QTRY_COMPARE(view.repaints, 1); QTRY_COMPARE(item->painted, 1); diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index 09cf4e2..6a2f849 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -2694,12 +2694,14 @@ void tst_QGraphicsScene::render() QPixmap pix(30, 30); pix.fill(Qt::blue); - QGraphicsScene scene; + QGraphicsView view; + QGraphicsScene scene(&view); scene.addEllipse(QRectF(-10, -10, 20, 20), QPen(Qt::black), QBrush(Qt::white)); scene.addEllipse(QRectF(-2, -7, 4, 4), QPen(Qt::black), QBrush(Qt::yellow))->setZValue(1); QGraphicsPixmapItem *item = scene.addPixmap(pix); item->setZValue(2); item->setOffset(QPointF(3, 3)); + view.show(); scene.setSceneRect(scene.itemsBoundingRect()); @@ -2820,6 +2822,8 @@ void tst_QGraphicsScene::contextMenuEvent() QGraphicsView view(&scene); view.show(); + QTest::qWaitForWindowShown(&view); + view.activateWindow(); #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&view); #endif @@ -2851,12 +2855,14 @@ void tst_QGraphicsScene::contextMenuEvent_ItemIgnoresTransformations() item->setFlag(QGraphicsItem::ItemIgnoresTransformations); scene.addItem(item); - QGraphicsView view(&scene); + QWidget topLevel; + QGraphicsView view(&scene, &topLevel); view.resize(200, 200); - view.show(); + topLevel.show(); #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&view); #endif + QTest::qWaitForWindowShown(&topLevel); { QPoint pos(50, 50); diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index af02c55..0a9633f 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -69,8 +69,10 @@ #include <QtGui/QStyle> #include <QtGui/QPushButton> #include <QtGui/QInputContext> +#include <QtGui/QDesktopWidget> #include <private/qgraphicsview_p.h> #include "../../shared/util.h" +#include "../platformquirks.h" //TESTED_CLASS= //TESTED_FILES= @@ -400,10 +402,13 @@ void tst_QGraphicsView::interactive() scene.addItem(item); QGraphicsView view(&scene); + if (PlatformQuirks::isAutoMaximizing()) + view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); view.setFixedSize(300, 300); QCOMPARE(item->events.size(), 0); view.show(); QTest::qWaitForWindowShown(&view); + view.activateWindow(); QApplication::processEvents(); QTRY_COMPARE(item->events.size(), 1); // activate @@ -531,13 +536,15 @@ void tst_QGraphicsView::sceneRect() void tst_QGraphicsView::sceneRect_growing() { + QWidget toplevel; + QGraphicsScene scene; for (int i = 0; i < 100; ++i) scene.addText(QString("(0, %1)").arg((i - 50) * 20))->setPos(0, (i - 50) * 20); - QGraphicsView view(&scene); + QGraphicsView view(&scene, &toplevel); view.setFixedSize(200, 200); - view.show(); + toplevel.show(); int size = 200; scene.setSceneRect(-size, -size, size * 2, size * 2); @@ -854,15 +861,17 @@ void tst_QGraphicsView::dragMode_rubberBand() void tst_QGraphicsView::rubberBandSelectionMode() { + QWidget toplevel; + QGraphicsScene scene; QGraphicsRectItem *rect = scene.addRect(QRectF(10, 10, 80, 80)); rect->setFlag(QGraphicsItem::ItemIsSelectable); - QGraphicsView view(&scene); + QGraphicsView view(&scene, &toplevel); QCOMPARE(view.rubberBandSelectionMode(), Qt::IntersectsItemShape); view.setDragMode(QGraphicsView::RubberBandDrag); view.resize(120, 120); - view.show(); + toplevel.show(); // Disable mouse tracking to prevent the window system from sending mouse // move events to the viewport while we are synthesizing events. If @@ -1071,16 +1080,18 @@ void tst_QGraphicsView::matrix_combine() void tst_QGraphicsView::centerOnPoint() { + QWidget toplevel; + QGraphicsScene scene; scene.addEllipse(QRectF(-100, -100, 50, 50)); scene.addEllipse(QRectF(50, -100, 50, 50)); scene.addEllipse(QRectF(-100, 50, 50, 50)); scene.addEllipse(QRectF(50, 50, 50, 50)); - QGraphicsView view(&scene); + QGraphicsView view(&scene, &toplevel); view.setSceneRect(-400, -400, 800, 800); view.setFixedSize(100, 100); - view.show(); + toplevel.show(); int tolerance = 5; @@ -1155,6 +1166,8 @@ void tst_QGraphicsView::centerOnItem() void tst_QGraphicsView::ensureVisibleRect() { + QWidget toplevel; + QGraphicsScene scene; QGraphicsItem *items[4]; items[0] = scene.addEllipse(QRectF(-25, -25, 50, 50), QPen(Qt::black), QBrush(Qt::green)); @@ -1170,11 +1183,11 @@ void tst_QGraphicsView::ensureVisibleRect() QGraphicsItem *icon = scene.addEllipse(QRectF(-10, -10, 20, 20), QPen(Qt::black), QBrush(Qt::gray)); - QGraphicsView view(&scene); + QGraphicsView view(&scene, &toplevel); view.setSceneRect(-500, -500, 1000, 1000); view.setFixedSize(250, 250); - view.show(); - QTest::qWaitForWindowShown(&view); + toplevel.show(); + QTest::qWaitForWindowShown(&toplevel); for (int y = -100; y < 100; y += 25) { for (int x = -100; x < 100; x += 13) { @@ -1253,6 +1266,9 @@ void tst_QGraphicsView::fitInView() view.setFixedSize(400, 200); #endif + if (PlatformQuirks::isAutoMaximizing()) + view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); + view.show(); view.fitInView(scene.itemsBoundingRect(), Qt::IgnoreAspectRatio); qApp->processEvents(); @@ -1432,10 +1448,12 @@ void tst_QGraphicsView::itemsInRect_cosmeticAdjust() QGraphicsView view(&scene); view.setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing, !adjustForAntialiasing); view.setRenderHint(QPainter::Antialiasing, adjustForAntialiasing); + if (PlatformQuirks::isAutoMaximizing()) + view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); view.setFrameStyle(0); view.resize(300, 300); view.show(); - QTest::qWaitForWindowShown(&view) ; + QTest::qWaitForWindowShown(&view); QTRY_VERIFY(rect->numPaints > 0); rect->numPaints = 0; @@ -1614,7 +1632,8 @@ void tst_QGraphicsView::mapToScene() QGraphicsScene scene; scene.addPixmap(QPixmap("3D-Qt-1-2.png")); - QGraphicsView view; + QWidget topLevel; + QGraphicsView view(&topLevel); view.setScene(&scene); view.setSceneRect(-500, -500, 1000, 1000); #if defined(Q_OS_WINCE) @@ -1624,7 +1643,7 @@ void tst_QGraphicsView::mapToScene() #endif view.setFixedSize(viewSize); - view.show(); + topLevel.show(); QApplication::processEvents(); QVERIFY(view.isVisible()); QCOMPARE(view.size(), viewSize); @@ -1804,11 +1823,14 @@ void tst_QGraphicsView::mapFromScenePoint() } } { + QWidget toplevel; + QGraphicsScene scene(0, 0, 200, 200); scene.addRect(QRectF(0, 0, 200, 200), QPen(Qt::black, 1)); - QGraphicsView view(&scene); + QGraphicsView view(&scene, &toplevel); + view.ensurePolished(); view.resize(view.sizeHint()); - view.show(); + toplevel.show(); QCOMPARE(view.mapFromScene(0, 0), QPoint(0, 0)); QCOMPARE(view.mapFromScene(0.4, 0.4), QPoint(0, 0)); @@ -1826,12 +1848,13 @@ void tst_QGraphicsView::mapFromScenePoint() void tst_QGraphicsView::mapFromSceneRect() { QGraphicsScene scene; - QGraphicsView view(&scene); + QWidget topLevel; + QGraphicsView view(&scene,&topLevel); view.rotate(90); view.setFixedSize(200, 200); view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - view.show(); + topLevel.show(); QTest::qWait(25); QPolygon polygon; @@ -2030,6 +2053,9 @@ void tst_QGraphicsView::cursor() #if defined(Q_OS_WINCE) QSKIP("Qt/CE does not have regular cursor support", SkipAll); #endif + if (PlatformQuirks::haveMouseCursor()) + QSKIP("The Platform does not have regular cursor support", SkipAll); + QGraphicsScene scene; QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20)); item->setCursor(Qt::IBeamCursor); @@ -2057,6 +2083,9 @@ void tst_QGraphicsView::cursor2() #if defined(Q_OS_WINCE) QSKIP("Qt/CE does not have regular cursor support", SkipAll); #endif + if (PlatformQuirks::haveMouseCursor()) + QSKIP("The Platform does not have regular cursor support", SkipAll); + QGraphicsScene scene; QGraphicsItem *item = scene.addRect(QRectF(-10, -10, 20, 20)); item->setCursor(Qt::IBeamCursor); @@ -2209,6 +2238,8 @@ class CustomView : public QGraphicsView Q_OBJECT public: CustomView(QGraphicsScene *s = 0) : QGraphicsView(s) {} + CustomView(QGraphicsScene *s, QWidget *parent) + : QGraphicsView(s, parent) {} QList<QRegion> lastUpdateRegions; bool painted; @@ -2227,8 +2258,11 @@ void tst_QGraphicsView::viewportUpdateMode() scene.setBackgroundBrush(Qt::red); CustomView view; - view.setFixedSize(500, 500); + QDesktopWidget desktop; + view.setFixedSize(QSize(500, 500).boundedTo(desktop.availableGeometry().size())); // 500 is too big for all common smartphones view.setScene(&scene); + if(PlatformQuirks::isAutoMaximizing()) + view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); QCOMPARE(view.viewportUpdateMode(), QGraphicsView::MinimalViewportUpdate); // Show the view, and initialize our test. @@ -2303,17 +2337,20 @@ void tst_QGraphicsView::viewportUpdateMode() void tst_QGraphicsView::viewportUpdateMode2() { + QWidget toplevel; + // Create a view with viewport rect equal to QRect(0, 0, 200, 200). QGraphicsScene dummyScene; - CustomView view; + CustomView view(0, &toplevel); view.painted = false; view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); view.setScene(&dummyScene); + view.ensurePolished(); // make sure we get the right content margins int left, top, right, bottom; view.getContentsMargins(&left, &top, &right, &bottom); view.resize(200 + left + right, 200 + top + bottom); - view.show(); - QTest::qWaitForWindowShown(&view); + toplevel.show(); + QTest::qWaitForWindowShown(&toplevel); QTest::qWait(50); QTRY_VERIFY(view.painted); const QRect viewportRect = view.viewport()->rect(); @@ -3222,15 +3259,17 @@ void tst_QGraphicsView::scrollAfterResize() #else QCommonStyle style; #endif - QGraphicsView view; + QWidget toplevel; + + QGraphicsView view(&toplevel); view.setStyle(&style); if (reverse) view.setLayoutDirection(Qt::RightToLeft); view.setSceneRect(-1000, -1000, 2000, 2000); view.resize(300, 300); - view.show(); - QTest::qWaitForWindowShown(&view); + toplevel.show(); + QTest::qWaitForWindowShown(&toplevel); view.horizontalScrollBar()->setValue(0); view.verticalScrollBar()->setValue(0); QCOMPARE(view.viewportTransform(), x1); @@ -3321,8 +3360,10 @@ void tst_QGraphicsView::moveItemWhileScrolling() void tst_QGraphicsView::centerOnDirtyItem() { - QGraphicsView view; - view.setWindowFlags(view.windowFlags() | Qt::WindowStaysOnTopHint); + QWidget toplevel; + + QGraphicsView view(&toplevel); + toplevel.setWindowFlags(view.windowFlags() | Qt::WindowStaysOnTopHint); view.resize(200, 200); QGraphicsScene *scene = new QGraphicsScene; @@ -3334,8 +3375,9 @@ void tst_QGraphicsView::centerOnDirtyItem() scene->addItem(item); view.centerOn(item); - view.show(); - QTest::qWaitForWindowShown(&view); + toplevel.show(); + QTest::qWaitForWindowShown(&toplevel); + QTest::qWait(50); QImage before(view.viewport()->size(), QImage::Format_ARGB32); view.viewport()->render(&before); @@ -3697,19 +3739,26 @@ void tst_QGraphicsView::update() { QFETCH(QRect, updateRect); + // some window manager resize the toplevel to max screen size + // so we must make our view a child (no layout!) of a dummy toplevel + // to ensure that it's really 200x200 pixels + QWidget toplevel; + // Create a view with viewport rect equal to QRect(0, 0, 200, 200). QGraphicsScene dummyScene; - CustomView view; + CustomView view(0, &toplevel); view.setScene(&dummyScene); + view.ensurePolished(); // must ensure polished to get content margins right int left, top, right, bottom; view.getContentsMargins(&left, &top, &right, &bottom); view.resize(200 + left + right, 200 + top + bottom); - view.show(); - QTest::qWaitForWindowShown(&view); + toplevel.show(); + QTest::qWaitForWindowShown(&toplevel); - QApplication::setActiveWindow(&view); + + QApplication::setActiveWindow(&toplevel); QApplication::processEvents(); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&toplevel)); const QRect viewportRect = view.viewport()->rect(); QCOMPARE(viewportRect, QRect(0, 0, 200, 200)); @@ -3718,6 +3767,7 @@ void tst_QGraphicsView::update() const bool intersects = updateRect.intersects(viewportRect); QGraphicsViewPrivate *viewPrivate = static_cast<QGraphicsViewPrivate *>(qt_widget_private(&view)); QTRY_COMPARE(viewPrivate->updateRect(updateRect), intersects); + QApplication::processEvents(); view.lastUpdateRegions.clear(); viewPrivate->processPendingUpdates(); @@ -3741,22 +3791,22 @@ void tst_QGraphicsView::update2_data() QTest::addColumn<bool>("changedConnected"); // Anti-aliased. - QTest::newRow("pen width: 0.0, antialiasing: true") << 0.0 << true << false; - QTest::newRow("pen width: 1.5, antialiasing: true") << 1.5 << true << false; - QTest::newRow("pen width: 2.0, antialiasing: true") << 2.0 << true << false; - QTest::newRow("pen width: 3.0, antialiasing: true") << 3.0 << true << false; + QTest::newRow("pen width: 0.0, antialiasing: true") << qreal(0.0) << true << false; + QTest::newRow("pen width: 1.5, antialiasing: true") << qreal(1.5) << true << false; + QTest::newRow("pen width: 2.0, antialiasing: true") << qreal(2.0) << true << false; + QTest::newRow("pen width: 3.0, antialiasing: true") << qreal(3.0) << true << false; // Aliased. - QTest::newRow("pen width: 0.0, antialiasing: false") << 0.0 << false << false; - QTest::newRow("pen width: 1.5, antialiasing: false") << 1.5 << false << false; - QTest::newRow("pen width: 2.0, antialiasing: false") << 2.0 << false << false; - QTest::newRow("pen width: 3.0, antialiasing: false") << 3.0 << false << false; + QTest::newRow("pen width: 0.0, antialiasing: false") << qreal(0.0) << false << false; + QTest::newRow("pen width: 1.5, antialiasing: false") << qreal(1.5) << false << false; + QTest::newRow("pen width: 2.0, antialiasing: false") << qreal(2.0) << false << false; + QTest::newRow("pen width: 3.0, antialiasing: false") << qreal(3.0) << false << false; // changed() connected - QTest::newRow("pen width: 0.0, antialiasing: false, changed") << 0.0 << false << true; - QTest::newRow("pen width: 1.5, antialiasing: true, changed") << 1.5 << true << true; - QTest::newRow("pen width: 2.0, antialiasing: false, changed") << 2.0 << false << true; - QTest::newRow("pen width: 3.0, antialiasing: true, changed") << 3.0 << true << true; + QTest::newRow("pen width: 0.0, antialiasing: false, changed") << qreal(0.0) << false << true; + QTest::newRow("pen width: 1.5, antialiasing: true, changed") << qreal(1.5) << true << true; + QTest::newRow("pen width: 2.0, antialiasing: false, changed") << qreal(2.0) << false << true; + QTest::newRow("pen width: 3.0, antialiasing: true, changed") << qreal(3.0) << true << true; } void tst_QGraphicsView::update2() @@ -4198,8 +4248,8 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins() class VpGraphicsView: public QGraphicsView { public: - VpGraphicsView(QGraphicsScene *scene) - : QGraphicsView(scene) + VpGraphicsView(QGraphicsScene *scene, QWidget *parent=0) + : QGraphicsView(scene, parent) { setViewportMargins(8, 16, 12, 20); setTransformationAnchor(QGraphicsView::AnchorUnderMouse); @@ -4210,6 +4260,7 @@ void tst_QGraphicsView::task255529_transformationAnchorMouseAndViewportMargins() VpGraphicsView view(&scene); view.setWindowFlags(Qt::X11BypassWindowManagerHint); view.show(); + QTest::qWaitForWindowShown(&view); QTest::qWait(50); QPoint mouseViewPos(20, 20); @@ -4324,6 +4375,9 @@ void tst_QGraphicsView::QTBUG_4151_clipAndIgnore() view.setFrameStyle(0); view.resize(75, 75); view.show(); + QTest::qWaitForWindowShown(&view); + view.activateWindow(); + QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view); QCOMPARE(view.items(view.rect()).size(), numItems); @@ -4357,6 +4411,8 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() scene.addItem(&item); QGraphicsView view(&scene); + if (PlatformQuirks::isAutoMaximizing()) + view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); view.scale(4.15, 4.15); view.show(); QTest::qWaitForWindowShown(&view); diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index 9d6def8..2368d59 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -53,6 +53,7 @@ #include <qaction.h> #include <qwidgetaction.h> #include "../../shared/util.h" +#include "../platformquirks.h" class EventSpy : public QObject @@ -1111,6 +1112,10 @@ void tst_QGraphicsWidget::initStyleOption_data() // void initStyleOption(QStyleOption* option) const public void tst_QGraphicsWidget::initStyleOption() { +#ifdef Q_WS_MAEMO_5 + QSKIP("The test passes, but it doesn't work when the display is in energy saving mode", SkipAll); +#endif + QGraphicsScene scene; QGraphicsView view(&scene); view.show(); @@ -1773,6 +1778,9 @@ void tst_QGraphicsWidget::verifyFocusChain() void tst_QGraphicsWidget::updateFocusChainWhenChildDie() { +#ifdef Q_WS_MAEMO_5 + QSKIP("On Maemo 5 the Display Manager is shown on Window change, so the test won't work", SkipAll); +#endif QGraphicsScene scene; QGraphicsView view(&scene); view.show(); @@ -3144,7 +3152,10 @@ void tst_QGraphicsWidget::initialShow() MyGraphicsWidget *widget = new MyGraphicsWidget; QGraphicsView view(&scene); - view.show(); + if(PlatformQuirks::isAutoMaximizing()) + view.showFullScreen(); + else + view.show(); QTest::qWaitForWindowShown(&view); scene.addItem(widget); @@ -3186,7 +3197,7 @@ void tst_QGraphicsWidget::initialShow2() scene.addItem(widget); QGraphicsView view(&scene); - view.setWindowFlags(Qt::X11BypassWindowManagerHint); + view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); view.show(); QTest::qWaitForWindowShown(&view); diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp index e0924de..ed6d635 100644 --- a/tests/auto/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp @@ -52,6 +52,7 @@ #include <QStyleFactory> #include "../../shared/util.h" +#include "../platformquirks.h" //TESTED_CLASS= //TESTED_FILES=gui/kernel/qlayout.cpp gui/kernel/qlayout.h @@ -678,6 +679,8 @@ void tst_QGridLayout::spacingsAndMargins() QApplication::setStyle(new Qt42Style); QWidget toplevel; + if(PlatformQuirks::isAutoMaximizing()) + toplevel.setWindowFlags(Qt::X11BypassWindowManagerHint); QVBoxLayout vbox(&toplevel); QGridLayout grid1; vbox.addLayout(&grid1); @@ -713,11 +716,12 @@ void tst_QGridLayout::spacingsAndMargins() toplevel.show(); toplevel.adjustSize(); QApplication::processEvents(); + QTest::qWaitForWindowShown(&toplevel); QSize topsize = toplevel.size(); QSize minimumsize = vbox.totalMinimumSize(); -#ifdef Q_WS_QWS +#if defined(Q_WS_QWS) if (topsize.width() < minimumsize.width() || topsize.height() < minimumsize.height()) QSKIP("The screen is too small to run this test case", SkipSingle); #endif @@ -1463,15 +1467,18 @@ void tst_QGridLayout::layoutSpacingImplementation() QFETCH(int, vSpacing); QFETCH(bool, customSubElementRect); + QWidget toplevel; + CustomLayoutStyle *style = new CustomLayoutStyle(); style->hspacing = hSpacing; style->vspacing = vSpacing; style->reimplementSubelementRect = customSubElementRect; QApplication::setStyle(style); + widget->setParent(&toplevel); widget->resize(widget->sizeHint()); - widget->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(widget); // wait for the show + toplevel.show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&toplevel); // wait for the show #endif QLayout *layout = widget->layout(); @@ -1482,8 +1489,6 @@ void tst_QGridLayout::layoutSpacingImplementation() //qDebug() << item->widget()->pos(); QCOMPARE(item->widget()->pos(), expectedpositions.at(pi)); } - delete widget; - } void tst_QGridLayout::spacing() diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index da0a0bb..5252ec6 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -196,6 +196,7 @@ private slots: void QTBUG12268_hiddenMovedSectionSorting(); protected: + QWidget *topLevel; QHeaderView *view; QStandardItemModel *model; }; @@ -345,7 +346,8 @@ void tst_QHeaderView::cleanupTestCase() void tst_QHeaderView::init() { - view = new QHeaderView(Qt::Vertical); + topLevel = new QWidget(); + view = new QHeaderView(Qt::Vertical,topLevel); // Some initial value tests before a model is added QCOMPARE(view->length(), 0); QVERIFY(view->sizeHint() == QSize(0,0)); @@ -373,7 +375,8 @@ void tst_QHeaderView::init() QSignalSpy spy(view, SIGNAL(sectionCountChanged(int, int))); view->setModel(model); QCOMPARE(spy.count(), 1); - view->show(); + view->resize(200,200); + topLevel->show(); } void tst_QHeaderView::cleanup() @@ -508,7 +511,7 @@ void tst_QHeaderView::stretch() view->resize(viewSize); view->setStretchLastSection(true); QCOMPARE(view->stretchLastSection(), true); - view->show(); + topLevel->show(); QCOMPARE(view->width(), viewSize.width()); QCOMPARE(view->visualIndexAt(view->viewport()->height() - 5), 3); @@ -674,7 +677,7 @@ void tst_QHeaderView::visualIndexAt() QFETCH(QList<int>, visual); view->setStretchLastSection(true); - view->show(); + topLevel->show(); for (int i = 0; i < hidden.count(); ++i) view->setSectionHidden(hidden.at(i), true); @@ -682,6 +685,8 @@ void tst_QHeaderView::visualIndexAt() for (int j = 0; j < from.count(); ++j) view->moveSection(from.at(j), to.at(j)); + QTest::qWait(100); + for (int k = 0; k < coordinate.count(); ++k) QCOMPARE(view->visualIndexAt(coordinate.at(k)), visual.at(k)); } @@ -696,7 +701,7 @@ void tst_QHeaderView::length() view->setFont(font); #endif view->setStretchLastSection(true); - view->show(); + topLevel->show(); //minimumSectionSize should be the size of the last section of the widget is not tall enough int length = view->minimumSectionSize(); @@ -708,7 +713,7 @@ void tst_QHeaderView::length() QCOMPARE(length, view->length()); view->setStretchLastSection(false); - view->show(); + topLevel->show(); QVERIFY(length != view->length()); @@ -759,7 +764,7 @@ void tst_QHeaderView::logicalIndexAt() QCOMPARE(view->logicalIndexAt(0), 0); QCOMPARE(view->logicalIndexAt(1), 0); - view->show(); + topLevel->show(); view->setStretchLastSection(true); // First item QCOMPARE(view->logicalIndexAt(0), 0); @@ -1062,7 +1067,7 @@ void tst_QHeaderView::resizeWithResizeModes() view->resizeSection(i, sections.at(i)); view->setResizeMode(i, (QHeaderView::ResizeMode)modes.at(i)); } - view->show(); + topLevel->show(); view->resize(size, size); for (int j = 0; j < expected.count(); ++j) QCOMPARE(view->sectionSize(j), expected.at(j)); @@ -1160,7 +1165,7 @@ void tst_QHeaderView::resizeSection() view->resize(400, 400); - view->show(); + topLevel->show(); view->setMovable(true); view->setStretchLastSection(false); @@ -2035,14 +2040,14 @@ void tst_QHeaderView::QTBUG7833_sectionClicked() QTest::mouseClick(tv.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier, - QPoint(tv.horizontalHeader()->sectionViewportPosition(11) + 5, 5)); + QPoint(tv.horizontalHeader()->sectionViewportPosition(11) + tv.horizontalHeader()->sectionSize(11)/2, 5)); QCOMPARE(clickedSpy.count(), 1); QCOMPARE(pressedSpy.count(), 1); QCOMPARE(clickedSpy.at(0).at(0).toInt(), 11); QCOMPARE(pressedSpy.at(0).at(0).toInt(), 11); QTest::mouseClick(tv.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier, - QPoint(tv.horizontalHeader()->sectionViewportPosition(8) + 5, 5)); + QPoint(tv.horizontalHeader()->sectionViewportPosition(8) + tv.horizontalHeader()->sectionSize(0)/2, 5)); QCOMPARE(clickedSpy.count(), 2); QCOMPARE(pressedSpy.count(), 2); @@ -2050,7 +2055,7 @@ void tst_QHeaderView::QTBUG7833_sectionClicked() QCOMPARE(pressedSpy.at(1).at(0).toInt(), 8); QTest::mouseClick(tv.horizontalHeader()->viewport(), Qt::LeftButton, Qt::NoModifier, - QPoint(tv.horizontalHeader()->sectionViewportPosition(0) + 5, 5)); + QPoint(tv.horizontalHeader()->sectionViewportPosition(0) + tv.horizontalHeader()->sectionSize(0)/2, 5)); QCOMPARE(clickedSpy.count(), 3); QCOMPARE(pressedSpy.count(), 3); diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index 4b4bdd6..d213e8e 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -55,6 +55,8 @@ #include <QTcpServer> #include <QTimer> +#include "../platformquirks.h" + #if defined(Q_OS_SYMBIAN) # define SRCDIR "." #endif @@ -315,23 +317,27 @@ void tst_QImageReader::jpegRgbCmyk() QImage image1(prefix + QLatin1String("YCbCr_cmyk.jpg")); QImage image2(prefix + QLatin1String("YCbCr_cmyk.png")); - // first, do some obvious tests - QCOMPARE(image1.height(), image2.height()); - QCOMPARE(image1.width(), image2.width()); - QCOMPARE(image1.format(), image2.format()); - QCOMPARE(image1.format(), QImage::Format_RGB32); - - // compare all the pixels with a slack of 3. This ignores rounding errors in libjpeg/libpng - for (int h = 0; h < image1.height(); ++h) { - const uchar *s1 = image1.constScanLine(h); - const uchar *s2 = image2.constScanLine(h); - for (int w = 0; w < image1.width() * 4; ++w) { - if (*s1 != *s2) { - QVERIFY2(qAbs(*s1 - *s2) <= 3, qPrintable(QString("images differ in line %1, col %2 (image1: %3, image2: %4)").arg(h).arg(w).arg(*s1, 0, 16).arg(*s2, 0, 16))); + if (PlatformQuirks::isImageLoaderImprecise()) { + // first, do some obvious tests + QCOMPARE(image1.height(), image2.height()); + QCOMPARE(image1.width(), image2.width()); + QCOMPARE(image1.format(), image2.format()); + QCOMPARE(image1.format(), QImage::Format_RGB32); + + // compare all the pixels with a slack of 3. This ignores rounding errors in libjpeg/libpng + for (int h = 0; h < image1.height(); ++h) { + const uchar *s1 = image1.constScanLine(h); + const uchar *s2 = image2.constScanLine(h); + for (int w = 0; w < image1.width() * 4; ++w) { + if (*s1 != *s2) { + QVERIFY2(qAbs(*s1 - *s2) <= 3, qPrintable(QString("images differ in line %1, col %2 (image1: %3, image2: %4)").arg(h).arg(w).arg(*s1, 0, 16).arg(*s2, 0, 16))); + } + s1++; + s2++; } - s1++; - s2++; } + } else { + QCOMPARE(image1, image2); } } diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp index 5d03142..580c644 100644 --- a/tests/auto/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp @@ -147,9 +147,10 @@ void testInvalidateAndRestore( QVERIFY(sbox->hasAcceptableInput()); QVERIFY(okButton->isEnabled()); QCOMPARE(sbox->value(), lastValidValue); + QLocale loc; QCOMPARE( normalizeNumericString(ledit->text()), - normalizeNumericString(QString("%1").arg(sbox->value()))); + normalizeNumericString(loc.toString(sbox->value()))); } template <typename SpinBoxType, typename ValueType> @@ -169,9 +170,10 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0) QVERIFY(sbox->value() >= sbox->minimum()); QVERIFY(sbox->value() <= sbox->maximum()); QVERIFY(sbox->hasAcceptableInput()); + QLocale loc; QCOMPARE( normalizeNumericString(ledit->selectedText()), - normalizeNumericString(QString("%1").arg(sbox->value()))); + normalizeNumericString(loc.toString(sbox->value()))); QVERIFY(okButton->isEnabled()); const ValueType origValue = sbox->value(); @@ -185,7 +187,7 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0) testTypingValue<SpinBoxType>(sbox, okButton, "0.0"); testTypingValue<SpinBoxType>(sbox, okButton, "foobar"); - testTypingValue<SpinBoxType>(sbox, okButton, QString("%1").arg(origValue)); + testTypingValue<SpinBoxType>(sbox, okButton, loc.toString(origValue)); } void testGetText(QInputDialog *dialog) diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index c6fe3f0..a974a42 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -133,12 +133,13 @@ void tst_QLayout::geometry() // For QWindowsStyle we know that QWidgetItem::geometry() and QWidget::geometry() // should be the same. QApplication::setStyle(new QWindowsStyle); - QWidget w; + QWidget topLevel; + QWidget w(&topLevel); QVBoxLayout layout(&w); SizeHinterFrame widget(QSize(100,100)); layout.addWidget(&widget); QLayoutItem *item = layout.itemAt(0); - w.show(); + topLevel.show(); QApplication::processEvents(); QCOMPARE(item->geometry().size(), QSize(100,100)); diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp index 425ac89..523a3ab 100644 --- a/tests/auto/qlistview/tst_qlistview.cpp +++ b/tests/auto/qlistview/tst_qlistview.cpp @@ -334,7 +334,8 @@ void tst_QListView::cursorMove() int columns = 6; QStandardItemModel model(rows, columns); - QListView view; + QWidget topLevel; + QListView view(&topLevel); view.setModel(&model); for (int j = 0; j < columns; ++j) { @@ -358,7 +359,7 @@ void tst_QListView::cursorMove() view.setGridSize(cellsize); view.setViewMode(QListView::IconMode); view.doItemsLayout(); - view.show(); + topLevel.show(); QVector<Qt::Key> keymoves; keymoves << Qt::Key_Up << Qt::Key_Up << Qt::Key_Right << Qt::Key_Right << Qt::Key_Up @@ -1108,7 +1109,8 @@ void tst_QListView::selection() QFETCH(QRect, selectionRect); QFETCH(IntList, expectedItems); - PublicListView v; + QWidget topLevel; + PublicListView v(&topLevel); QtTestModel model; model.colCount = 1; model.rCount = itemCount; @@ -1142,7 +1144,7 @@ void tst_QListView::selection() v.resize(525,525); #endif - v.show(); + topLevel.show(); QTest::qWaitForWindowShown(&v); QApplication::processEvents(); @@ -1158,7 +1160,8 @@ void tst_QListView::selection() void tst_QListView::scrollTo() { - QListView lv; + QWidget topLevel; + QListView lv(&topLevel); QStringListModel model(&lv); QStringList list; list << "Short item 1"; @@ -1194,8 +1197,8 @@ void tst_QListView::scrollTo() model.setStringList(list); lv.setModel(&model); lv.setFixedSize(100, 200); - lv.show(); - QTest::qWaitForWindowShown(&lv); + topLevel.show(); + QTest::qWaitForWindowShown(&topLevel); //by default, the list view scrolls per item and has no wrapping QModelIndex index = model.index(6,0); @@ -1266,7 +1269,8 @@ void tst_QListView::scrollBarRanges() const int rowCount = 10; const int rowHeight = 20; - QListView lv; + QWidget topLevel; + QListView lv(&topLevel); QStringListModel model(&lv); QStringList list; for (int i = 0; i < rowCount; ++i) @@ -1278,7 +1282,7 @@ void tst_QListView::scrollBarRanges() TestDelegate *delegate = new TestDelegate(&lv); delegate->m_sizeHint = QSize(100, rowHeight); lv.setItemDelegate(delegate); - lv.show(); + topLevel.show(); for (int h = 30; h <= 210; ++h) { lv.resize(250, h); @@ -1354,14 +1358,15 @@ void tst_QListView::scrollBarAsNeeded() const int rowCounts[3] = {0, 1, 20}; - QListView lv; + QWidget topLevel; + QListView lv(&topLevel); lv.setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); lv.setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); lv.setFlow((QListView::Flow)flow); QStringListModel model(&lv); lv.setModel(&model); lv.resize(size); - lv.show(); + topLevel.show(); for (uint r = 0; r < sizeof(rowCounts)/sizeof(int); ++r) { QStringList list; @@ -1631,6 +1636,7 @@ void tst_QListView::task254449_draggingItemToNegativeCoordinates() list.setViewMode(QListView::IconMode); list.show(); QTest::qWaitForWindowShown(&list); + list.activateWindow(); class MyItemDelegate : public QStyledItemDelegate { @@ -1815,7 +1821,8 @@ void tst_QListView::taskQTBUG_2233_scrollHiddenItems() QFETCH(int, flow); const int rowCount = 200; - QListView view; + QWidget topLevel; + QListView view(&topLevel); QStringListModel model(&view); QStringList list; for (int i = 0; i < rowCount; ++i) @@ -1839,8 +1846,8 @@ void tst_QListView::taskQTBUG_2233_scrollHiddenItems() } //QTBUG-7929 should not crash - view.show(); - QTest::qWaitForWindowShown(&view); + topLevel.show(); + QTest::qWaitForWindowShown(&topLevel); QScrollBar *bar = view.flow() == QListView::TopToBottom ? view.verticalScrollBar() : view.horizontalScrollBar(); diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp index eb3fb6b..6cfd6c5 100644 --- a/tests/auto/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp @@ -1499,6 +1499,11 @@ void tst_QListWidget::itemWidget() class MyListWidget : public QListWidget { public: + MyListWidget(QWidget *parent=0) + : QListWidget(parent) + { + } + void paintEvent(QPaintEvent *e) { painted += e->region(); QListWidget::paintEvent(e); @@ -1513,14 +1518,17 @@ void tst_QListWidget::fastScroll() QSKIP("S60 style doesn't support fast scrolling", SkipAll); } - MyListWidget widget; + QWidget topLevel; + MyListWidget widget(&topLevel); for (int i = 0; i < 50; ++i) widget.addItem(QString("Item %1").arg(i)); - widget.show(); + topLevel.resize(300, 300); // toplevel needs to be wide enough for the item + topLevel.show(); // Make sure the widget gets the first full repaint. On // some WMs, we'll get two (first inactive exposure, then // active exposure. + QTest::qWaitForWindowShown(&widget); #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&widget); #endif @@ -1531,6 +1539,7 @@ void tst_QListWidget::fastScroll() QVERIFY(!itemSize.isEmpty()); QScrollBar *sbar = widget.verticalScrollBar(); + widget.setVerticalScrollMode(QAbstractItemView::ScrollPerItem); widget.painted = QRegion(); sbar->setValue(sbar->value() + sbar->singleStep()); QApplication::processEvents(); diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp index c82c566..e3122c4 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp @@ -55,6 +55,7 @@ #include <qtextedit.h> #include <private/qmainwindowlayout_p.h> #include <private/qdockarealayout_p.h> +#include "../platformquirks.h" //TESTED_FILES= @@ -1679,6 +1680,9 @@ void tst_QMainWindow::addToolbarAfterShow() void tst_QMainWindow::centralWidgetSize() { + if(PlatformQuirks::isAutoMaximizing()) + QSKIP("The platform is auto maximizing, so the test makes no sense", SkipAll);; + QMainWindow mainWindow; mainWindow.menuBar()->addMenu("menu"); diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp index f865738..6483f75 100644 --- a/tests/auto/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp @@ -63,6 +63,7 @@ #include <QMacStyle> #include "../../shared/util.h" +#include "../platformquirks.h" static const Qt::WindowFlags DefaultWindowFlags = Qt::SubWindow | Qt::WindowSystemMenuHint @@ -468,6 +469,8 @@ void tst_QMdiArea::subWindowActivated2() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&mdiArea); #endif + QTest::qWaitForWindowShown(&mdiArea); + mdiArea.activateWindow(); QTest::qWait(100); QTRY_COMPARE(spy.count(), 5); @@ -510,6 +513,9 @@ void tst_QMdiArea::subWindowActivated2() QCOMPARE(mdiArea.activeSubWindow(), activeSubWindow); spy.clear(); + if (PlatformQuirks::isAutoMaximizing()) + QSKIP("Platform is auto maximizing, so no showMinimized()", SkipAll); + // Check that we only emit _one_ signal and the active window // is unchanged after showMinimized/showNormal. mdiArea.showMinimized(); @@ -1119,9 +1125,10 @@ void tst_QMdiArea::currentSubWindow() void tst_QMdiArea::addAndRemoveWindows() { - QMdiArea workspace; + QWidget topLevel; + QMdiArea workspace(&topLevel); workspace.resize(800, 600); - workspace.show(); + topLevel.show(); #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&workspace); #endif @@ -1594,6 +1601,8 @@ void tst_QMdiArea::tileSubWindows() { QMdiArea workspace; workspace.resize(600,480); + if (PlatformQuirks::isAutoMaximizing()) + workspace.setWindowFlags(workspace.windowFlags() | Qt::X11BypassWindowManagerHint); workspace.show(); #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&workspace); @@ -1848,8 +1857,9 @@ void tst_QMdiArea::resizeMaximizedChildWindows() QFETCH(int, increment); QFETCH(int, windowCount); - QMdiArea workspace; - workspace.show(); + QWidget topLevel; + QMdiArea workspace(&topLevel); + topLevel.show(); #if defined(Q_WS_X11) qt_x11_wait_for_window_manager(&workspace); #endif @@ -2094,6 +2104,7 @@ void tst_QMdiArea::resizeTimer() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&mdiArea); #endif + QTest::qWaitForWindowShown(&mdiArea); #ifndef Q_OS_WINCE int time = 250; diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index 7065b13..84f1b94 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -298,15 +298,17 @@ void tst_QMenu::mouseActivation() #ifdef Q_OS_WINCE_WM QSKIP("We have a separate mouseActivation test for Windows mobile.", SkipAll); #endif - QMenu menu; + QWidget topLevel; + QMenu menu(&topLevel); + topLevel.show(); menu.addAction("Menu Action"); menu.show(); - QTest::mouseClick(&menu, Qt::LeftButton, 0, QPoint(5, 5), 300); + QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center(), 300); QVERIFY(!menu.isVisible()); //context menus can allways be accessed with right click except on windows menu.show(); - QTest::mouseClick(&menu, Qt::RightButton, 0, QPoint(5, 5), 300); + QTest::mouseClick(&menu, Qt::RightButton, 0, menu.rect().center(), 300); QVERIFY(!menu.isVisible()); #ifdef Q_OS_WIN @@ -466,9 +468,9 @@ void tst_QMenu::overrideMenuAction() m->addAction(aQuit); w.show(); + QTest::qWaitForWindowShown(&w); QApplication::setActiveWindow(&w); w.setFocus(); - QTest::qWaitForWindowShown(&w); QTRY_VERIFY(w.hasFocus()); //test of the action inside the menu @@ -504,6 +506,7 @@ void tst_QMenu::statusTip() w.addToolBar(&tb); w.show(); + QTest::qWaitForWindowShown(&w); QRect rect1 = tb.actionGeometry(&a); QToolButton *btn = qobject_cast<QToolButton*>(tb.childAt(rect1.center())); @@ -589,6 +592,8 @@ void tst_QMenu::tearOff() QVERIFY(menu->isTearOffEnabled()); widget.show(); + QTest::qWaitForWindowShown(&widget); + widget.activateWindow(); menu->popup(QPoint(0,0)); QTest::qWait(50); QVERIFY(!menu->isTearOffMenuVisible()); diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index cc9fb0c..8dfb976 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -338,6 +338,8 @@ void tst_QMenuBar::initTestCase_noQt3() initSimpleMenubar_noQt3(); mw->show(); + QTest::qWaitForWindowShown(mw); + mw->activateWindow(); menu1 = new QtTestSlot( mw ); menu2 = new QtTestSlot( mw ); @@ -1700,8 +1702,8 @@ void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions() QAction * a = menubar.addAction( "&a" ); menubar.show(); - QApplication::setActiveWindow(&menubar); QTest::qWaitForWindowShown(&menubar); + QApplication::setActiveWindow(&menubar); menubar.setActiveAction(m); QCOMPARE(menubar.activeAction(), m); QTest::keyClick(0, Qt::Key_Right); diff --git a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp index 99a8913..694d65d 100644 --- a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp +++ b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp @@ -147,12 +147,14 @@ void tst_qmouseevent_modal::mousePressRelease() QVERIFY( w->d->count() == 0 ); QTest::mousePress( w->pb, Qt::LeftButton ); + QTest::qWait(200); QVERIFY( !w->d->isVisible() ); QVERIFY( w->d->count() == 1 ); QVERIFY( !w->pb->isDown() ); QTest::mousePress( w->pb, Qt::LeftButton ); + QTest::qWait(200); QVERIFY( !w->d->isVisible() ); QVERIFY( w->d->count() == 2 ); @@ -161,12 +163,14 @@ void tst_qmouseevent_modal::mousePressRelease() // With the current QWS mouse handling, the 3rd press would fail... QTest::mousePress( w->pb, Qt::LeftButton ); + QTest::qWait(200); QVERIFY( !w->d->isVisible() ); QVERIFY( w->d->count() == 3 ); QVERIFY( !w->pb->isDown() ); QTest::mousePress( w->pb, Qt::LeftButton ); + QTest::qWait(200); QVERIFY( !w->d->isVisible() ); QVERIFY( w->d->count() == 4 ); diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 8850e6e..a986438 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -297,6 +297,10 @@ private Q_SLOTS: void qtbug4121unknownAuthentication(); + void qtbug13431replyThrottling(); + + void httpWithNoCredentialUsage(); + // NOTE: This test must be last! void parentingRepliesToTheApp(); }; @@ -3457,11 +3461,11 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp_data() { QTest::addColumn<bool>("https"); QTest::addColumn<int>("bufferSize"); - QTest::newRow("http, no limit") << false << 0; - QTest::newRow("http, limited") << false << 4096; + QTest::newRow("http+unlimited") << false << 0; + QTest::newRow("http+limited") << false << 4096; #ifndef QT_NO_OPENSSL - QTest::newRow("https, no limit") << true << 0; - QTest::newRow("https, limited") << true << 4096; + QTest::newRow("https+unlimited") << true << 0; + QTest::newRow("https+limited") << true << 4096; #endif } @@ -3534,6 +3538,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp() const int allowedDeviation = 16; // TODO find out why the send rate is 13% faster currently const int minRate = rate * 1024 * (100-allowedDeviation) / 100; const int maxRate = rate * 1024 * (100+allowedDeviation) / 100; + qDebug() << minRate << "<="<< server.transferRate << "<=" << maxRate << "?"; QVERIFY(server.transferRate >= minRate); QVERIFY(server.transferRate <= maxRate); } @@ -4642,6 +4647,83 @@ void tst_QNetworkReply::qtbug4121unknownAuthentication() QCOMPARE(reply->error(), QNetworkReply::AuthenticationRequiredError); } +class QtBug13431Helper : public QObject { + Q_OBJECT +public: + QNetworkReply* m_reply; + QTimer m_dlTimer; +public slots: + void replyFinished(QNetworkReply*) { + QTestEventLoop::instance().exitLoop(); + } + + void onReadAndReschedule() { + const qint64 bytesReceived = m_reply->bytesAvailable(); + if (bytesReceived) { + QByteArray data = m_reply->read(bytesReceived); + // reschedule read + const int millisecDelay = static_cast<int>(bytesReceived * 1000 / m_reply->readBufferSize()); + m_dlTimer.start(millisecDelay); + } + else { + // reschedule read + m_dlTimer.start(200); + } + } +}; + +void tst_QNetworkReply::qtbug13431replyThrottling() +{ + QtBug13431Helper helper; + + QNetworkAccessManager nam; + connect(&nam, SIGNAL(finished(QNetworkReply*)), &helper, SLOT(replyFinished(QNetworkReply*))); + + // Download a bigger file + QNetworkRequest netRequest(QUrl("http://qt-test-server/qtest/bigfile")); + helper.m_reply = nam.get(netRequest); + // Set the throttle + helper.m_reply->setReadBufferSize(36000); + + // Schedule a timer that tries to read + + connect(&helper.m_dlTimer, SIGNAL(timeout()), &helper, SLOT(onReadAndReschedule())); + helper.m_dlTimer.setSingleShot(true); + helper.m_dlTimer.start(0); + + QTestEventLoop::instance().enterLoop(30); + QVERIFY(!QTestEventLoop::instance().timeout()); + QVERIFY(helper.m_reply->isFinished()); + QCOMPARE(helper.m_reply->error(), QNetworkReply::NoError); +} + +void tst_QNetworkReply::httpWithNoCredentialUsage() +{ + QNetworkRequest request(QUrl("http://httptest:httptest@" + QtNetworkSettings::serverName() + "/qtest/protected/cgi-bin/md5sum.cgi")); + // Do not use credentials + request.setAttribute(QNetworkRequest::AuthenticationReuseAttribute, QNetworkRequest::Manual); + QNetworkAccessManager manager; + QNetworkReplyPtr reply = manager.get(request); + + qRegisterMetaType<QNetworkReply*>("QNetworkReply*"); + qRegisterMetaType<QAuthenticator*>("QAuthenticator*"); + QSignalSpy authSpy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*))); + QSignalSpy finishedSpy(&manager, SIGNAL(finished(QNetworkReply*))); + qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError"); + QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError))); + + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + + // We check if authenticationRequired was emitted, however we do not anything in it so it should be 401 + QCOMPARE(authSpy.count(), 1); + QCOMPARE(finishedSpy.count(), 1); + QCOMPARE(errorSpy.count(), 1); + + QCOMPARE(reply->error(), QNetworkReply::AuthenticationRequiredError); +} + // NOTE: This test must be last testcase in tst_qnetworkreply! diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/qpathclipper/tst_qpathclipper.cpp index 4dc12cb..98c67d0 100644 --- a/tests/auto/qpathclipper/tst_qpathclipper.cpp +++ b/tests/auto/qpathclipper/tst_qpathclipper.cpp @@ -1300,6 +1300,9 @@ void tst_QPathClipper::task251909() void tst_QPathClipper::qtbug3778() { + if (sizeof(double) != sizeof(qreal)) { + QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll); + } QPainterPath path1; path1.moveTo(200, 3.22409e-5); // e-5 and higher leads to a bug diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp index a6dd8be..99d11cc 100644 --- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp @@ -880,6 +880,7 @@ void tst_QPlainTextEdit::lineWrapModes() // We thus need to make it wide enough to show something visible. int minimumWidth = 2 * ed->document()->documentMargin(); minimumWidth += ed->fontMetrics().width(QLatin1Char('a')); + minimumWidth += ed->frameWidth(); ed->resize(minimumWidth, 1000); QCOMPARE(lineCount(), 26); ed->setParent(0); diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index e908961..fb9f8f0 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -596,12 +596,12 @@ void tst_QPrinter::testPageMargins_data() QTest::addColumn<qreal>("bottom"); QTest::addColumn<int>("unit"); - QTest::newRow("data0") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Millimeter); - QTest::newRow("data1") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Point); - QTest::newRow("data2") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Inch); - QTest::newRow("data3") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Pica); - QTest::newRow("data4") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Didot); - QTest::newRow("data5") << 5.5 << 6.5 << 7.5 << 8.5 << static_cast<int>(QPrinter::Cicero); + QTest::newRow("data0") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Millimeter); + QTest::newRow("data1") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Point); + QTest::newRow("data2") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Inch); + QTest::newRow("data3") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Pica); + QTest::newRow("data4") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Didot); + QTest::newRow("data5") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Cicero); } void tst_QPrinter::testPageMargins() diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index e7b5dc7..7cb2b65 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -1230,7 +1230,8 @@ void tst_QSplitter::testShowHide() QSplitter *split = new QSplitter(Qt::Horizontal); - QWidget widget; + QWidget topLevel; + QWidget widget(&topLevel); widget.resize(400 + split->handleWidth(), 200); QVBoxLayout *lay=new QVBoxLayout(&widget); lay->setMargin(0); @@ -1240,7 +1241,7 @@ void tst_QSplitter::testShowHide() split->setSizes(QList<int>() << 200 << 200); lay->addWidget(split); widget.setLayout(lay); - widget.show(); + topLevel.show(); QTest::qWait(100); @@ -1378,8 +1379,9 @@ class MyTextEdit : public QTextEdit void tst_QSplitter::task169702_sizes() { + QWidget topLevel; // Create two nested (non-collapsible) splitters - QSplitter* outerSplitter = new QSplitter(Qt::Vertical); + QSplitter* outerSplitter = new QSplitter(Qt::Vertical, &topLevel); outerSplitter->setChildrenCollapsible(false); QSplitter* splitter = new QSplitter(Qt::Horizontal, outerSplitter); splitter->setChildrenCollapsible(false); @@ -1396,12 +1398,12 @@ void tst_QSplitter::task169702_sizes() splitter->addWidget(new QTextEdit("Bar")); outerSplitter->setGeometry(100, 100, 500, 500); - outerSplitter->show(); + topLevel.show(); QTest::qWait(100); testW->m_iFactor++; testW->updateGeometry(); - QTest::qWait(100); + QTest::qWait(500);//100 is too fast for Maemo //Make sure the minimimSizeHint is respected QCOMPARE(testW->size().height(), testW->minimumSizeHint().height()); diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 9df2a4d..16cf872 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -4433,8 +4433,10 @@ void tst_QString::nanAndInf() CHECK_NAN("nan ", true, true) CHECK_NAN("\t NAN", true, true) CHECK_NAN("\t NAN ", true, true) +#ifndef QT_QLOCALE_USES_FCVT //In case we use glibc this tests will fail CHECK_NAN("-nan", false, false) CHECK_NAN("+NAN", false, false) +#endif CHECK_NAN("NaN", true, true) CHECK_NAN("nAn", true, true) CHECK_NAN("NANe-10", false, false) diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp index 04b1e79..0396408 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -48,6 +48,7 @@ #endif #include <private/qstylesheetstyle_p.h> +#include "../platformquirks.h" //TESTED_CLASS= //TESTED_FILES= @@ -822,6 +823,8 @@ void tst_QStyleSheetStyle::focusColors() void tst_QStyleSheetStyle::hoverColors() { + if (!PlatformQuirks::haveMouseCursor()) + QSKIP("No mouse Cursor on this platform",SkipAll); QList<QWidget *> widgets; widgets << new QPushButton("TESTING"); widgets << new QLineEdit("TESTING"); @@ -979,10 +982,11 @@ void tst_QStyleSheetStyle::background() void tst_QStyleSheetStyle::tabAlignement() { - QTabWidget tabWidget; + QWidget topLevel; + QTabWidget tabWidget(&topLevel); tabWidget.addTab(new QLabel("tab1"),"tab1"); tabWidget.resize(QSize(400,400)); - tabWidget.show(); + topLevel.show(); QTest::qWaitForWindowShown(&tabWidget); QTest::qWait(50); QTabBar *bar = qFindChild<QTabBar*>(&tabWidget); diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index 3e5d077..6c920c9 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -2591,9 +2591,10 @@ void tst_QTableView::scrollTo() QFETCH(int, expectedVerticalScroll); QtTestTableModel model(rowCount, columnCount); - QtTestTableView view; + QWidget toplevel; + QtTestTableView view(&toplevel); - view.show(); + toplevel.show(); // resizing to this size will ensure that there can ONLY_BE_ONE_CELL inside the view. QSize forcedSize(columnWidth * 2, rowHeight * 2); view.resize(forcedSize); @@ -2748,10 +2749,11 @@ void tst_QTableView::indexAt() QFETCH(int, expectedColumn); QtTestTableModel model(rowCount, columnCount); - QtTestTableView view; + QWidget toplevel; + QtTestTableView view(&toplevel); - view.show(); - QTest::qWaitForWindowShown(&view); + toplevel.show(); + QTest::qWaitForWindowShown(&toplevel); //some styles change the scroll mode in their polish view.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem); @@ -3657,20 +3659,23 @@ void tst_QTableView::mouseWheel() #ifdef Q_OS_WINCE QSKIP("Since different Windows CE versions sport different taskbars, we skip this test", SkipAll); #endif + QFETCH(int, scrollMode); QFETCH(int, delta); QFETCH(int, horizontalPositon); QFETCH(int, verticalPosition); QtTestTableModel model(100, 100); - QtTestTableView view; + QWidget topLevel; + QtTestTableView view(&topLevel); view.resize(500, 500); for (int r = 0; r < 100; ++r) view.setRowHeight(r, 50); for (int c = 0; c < 100; ++c) view.setColumnWidth(c, 100); - view.show(); - QTest::qWaitForWindowShown(&view); + topLevel.show(); + + QTest::qWaitForWindowShown(&topLevel); view.setModel(&model); @@ -3772,7 +3777,7 @@ void tst_QTableView::task191545_dragSelectRows() QRect cellRect = table.visualRect(model.index(3, 0)); QHeaderView *vHeader = table.verticalHeader(); QWidget *vHeaderVp = vHeader->viewport(); - QPoint rowPos(5, (cellRect.top() + cellRect.bottom()) / 2); + QPoint rowPos(cellRect.center()); QMouseEvent rowPressEvent(QEvent::MouseButtonPress, rowPos, Qt::LeftButton, Qt::NoButton, Qt::ControlModifier); qApp->sendEvent(vHeaderVp, &rowPressEvent); @@ -3851,6 +3856,7 @@ void tst_QTableView::task191545_dragSelectRows() QMouseEvent cellReleaseEvent(QEvent::MouseButtonRelease, cellPos, Qt::LeftButton, Qt::NoButton, Qt::ControlModifier); qApp->sendEvent(tableVp, &cellReleaseEvent); + QTest::qWait(200); for (int i = 0; i < 6; ++i) for (int j = 0; j < 6; ++j) { QModelIndex index = model.index(3 + i, 3 + j, table.rootIndex()); diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 101baa5..d1832d8 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -58,6 +58,7 @@ #include <qimagereader.h> #include <qimagewriter.h> #include <qcommonstyle.h> +#include <qlayout.h> #include <qabstracttextdocumentlayout.h> #include <qtextdocumentfragment.h> @@ -2111,6 +2112,7 @@ void tst_QTextEdit::setDocumentPreservesPalette() QPalette whitePal = ed->palette(); whitePal.setColor(QPalette::Active, QPalette::Text, "white"); + QVERIFY(whitePal != ed->palette()); ed->setPalette(whitePal); QVERIFY(whitePal.color(QPalette::Active, QPalette::Text) @@ -2155,9 +2157,15 @@ void tst_QTextEdit::pasteFromQt3RichText() void tst_QTextEdit::noWrapBackgrounds() { + QWidget topLevel; + QVBoxLayout *layout = new QVBoxLayout(&topLevel); + QTextEdit edit; edit.setLineWrapMode(QTextEdit::NoWrap); + // hide the cursor in order to make the image comparison below reliable + edit.setCursorWidth(0); + QTextFrame *root = edit.document()->rootFrame(); QTextFrameFormat frameFormat = root->frameFormat(); frameFormat.setLeftMargin(2); @@ -2170,6 +2178,9 @@ void tst_QTextEdit::noWrapBackgrounds() edit.insertPlainText(QLatin1String(" \n \n \n \n")); edit.setFixedSize(100, 200); + layout->addWidget(&edit); + topLevel.show(); + QImage img = QPixmap::grabWidget(edit.viewport()).toImage(); QCOMPARE(img, img.mirrored(true, false)); } diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index c7b53e9..3c2bf15 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -2379,11 +2379,12 @@ void tst_QTreeView::extendedSelection() QFETCH(int, selectedCount); QStandardItemModel model(5, 2); - QTreeView view; + QWidget topLevel; + QTreeView view(&topLevel); view.resize(qMax(mousePressPos.x() * 2, 200), qMax(mousePressPos.y() * 2, 200)); view.setModel(&model); view.setSelectionMode(QAbstractItemView::ExtendedSelection); - view.show(); + topLevel.show(); QTest::mousePress(view.viewport(), Qt::LeftButton, 0, mousePressPos); QCOMPARE(view.selectionModel()->selectedIndexes().count(), selectedCount); } @@ -3280,9 +3281,10 @@ void tst_QTreeView::task220298_selectColumns() void tst_QTreeView::task224091_appendColumns() { QStandardItemModel *model = new QStandardItemModel(); - QTreeView *treeView = new QTreeView(); + QWidget* topLevel= new QWidget; + QTreeView *treeView = new QTreeView(topLevel); treeView->setModel(model); - treeView->show(); + topLevel->show(); treeView->resize(50,50); QTest::qWaitForWindowShown(treeView); @@ -3299,7 +3301,7 @@ void tst_QTreeView::task224091_appendColumns() QTRY_VERIFY(treeView->verticalScrollBar()->isVisible()); - delete treeView; + delete topLevel; delete model; } @@ -3758,7 +3760,8 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint() void tst_QTreeView::keyboardNavigationWithDisabled() { - QTreeView view; + QWidget topLevel; + QTreeView view(&topLevel); QStandardItemModel model(90, 0); for (int i = 0; i < 90; i ++) { model.setItem(i, new QStandardItem(QString::number(i))); @@ -3767,10 +3770,10 @@ void tst_QTreeView::keyboardNavigationWithDisabled() view.setModel(&model); view.resize(200, view.visualRect(model.index(0,0)).height()*10); - view.show(); - QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_VERIFY(view.isActiveWindow()); + topLevel.show(); + QApplication::setActiveWindow(&topLevel); + QTest::qWaitForWindowShown(&topLevel); + QTRY_VERIFY(topLevel.isActiveWindow()); view.setCurrentIndex(model.index(1, 0)); QTest::keyClick(view.viewport(), Qt::Key_Up); diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp index 1e37384..32bf557 100644 --- a/tests/auto/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp @@ -464,6 +464,7 @@ void tst_QTreeWidget::editItem() QTreeWidget tree; populate(&tree, topLevelItems, new TreeItem(QStringList() << "1" << "2")); tree.show(); + QTest::qWaitForWindowShown(&tree); QSignalSpy itemChangedSpy( &tree, SIGNAL(itemChanged(QTreeWidgetItem*,int))); @@ -3098,8 +3099,9 @@ void tst_QTreeWidget::task253109_itemHeight() void tst_QTreeWidget::task206367_duplication() { - QTreeWidget treeWidget; - treeWidget.show(); + QWidget topLevel; + QTreeWidget treeWidget(&topLevel); + topLevel.show(); treeWidget.resize(200, 200); treeWidget.setSortingEnabled(true); diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp index 5391591..ffc4730 100644 --- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp +++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp @@ -76,7 +76,7 @@ private slots: static const int iterations = 10; // Note: some tests rely on ThreadCount being multiple of 2 -#ifdef Q_OS_SOLARIS +#if defined(Q_OS_SOLARIS) || ( defined(Q_OS_LINUX) && defined(QT_ARCH_ARMV6) ) static const int ThreadCount = 4; #else static const int ThreadCount = 10; diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 2187aeb..e6c40b8 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -1197,9 +1197,15 @@ void tst_QXmlQuery::basicXQueryToQtTypeCheck() const expectedValues.append(QVariant()); /* xs:dayTimeDuration */ expectedValues.append(QVariant()); /* xs:yearMonthDuration */ - expectedValues.append(QVariant(double(3e3))); /* xs:float */ - expectedValues.append(QVariant(double(4e4))); /* xs:double */ - expectedValues.append(QVariant(double(2))); /* xs:decimal */ + if(sizeof(qreal) == sizeof(float)) {//ARM casts to Float not to double + expectedValues.append(QVariant(float(3e3))); /* xs:float */ + expectedValues.append(QVariant(float(4e4))); /* xs:double */ + expectedValues.append(QVariant(float(2))); /* xs:decimal */ + } else { + expectedValues.append(QVariant(double(3e3))); /* xs:float */ + expectedValues.append(QVariant(double(4e4))); /* xs:double */ + expectedValues.append(QVariant(double(2))); /* xs:decimal */ + } /* xs:integer and its sub-types. */ expectedValues.append(QVariant(qlonglong(16))); @@ -1347,10 +1353,17 @@ void tst_QXmlQuery::basicQtToXQueryTypeCheck() const QVERIFY(!item.isNull()); QVERIFY(item.isAtomicValue()); - QCOMPARE(item.toAtomicValue().toString(), - QLatin1String("4 true 3 654 7 41414141 C 2000-10-11Z 2001-09-10T01:02:03 " - "A QString http://example.com/ 5 6 true true true true true true true true true true " - "true true true")); + if(sizeof(qreal) == sizeof(float)) //ARM casts to Float not to double + QCOMPARE(item.toAtomicValue().toString(), + QLatin1String("4 true 3 654 7 41414141 C 2000-10-11Z 2001-09-10T01:02:03 " + "A QString http://example.com/ 5 6 true false false true true true true true true true " + "true true true")); + else + QCOMPARE(item.toAtomicValue().toString(), + QLatin1String("4 true 3 654 7 41414141 C 2000-10-11Z 2001-09-10T01:02:03 " + "A QString http://example.com/ 5 6 true true true true true true true true true true " + "true true true")); + } void tst_QXmlQuery::bindNode() const diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp index 28970eb..1572a5f 100644 --- a/tests/auto/symbols/tst_symbols.cpp +++ b/tests/auto/symbols/tst_symbols.cpp @@ -443,7 +443,7 @@ void tst_Symbols::prefix() # if defined(Q_OS_LINUX) && defined(Q_CC_INTEL) QEXPECT_FAIL("", "linux-icc* incorrectly exports some QtWebkit symbols, waiting for a fix from Intel.", Continue); # endif - QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output :)"); + QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output above."); #else QSKIP("Linux-specific test", SkipAll); #endif diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 30a63c8..698164d 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -9,7 +9,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <div id=\"nav-logo\">\n" \ " <a href=\"index.html\">Home</a></div>\n" \ " <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \ - " <div id="narrowsearch"></div>\n" \ + " <div id=\"narrowsearch\"></div>\n" \ " <div id=\"nav-topright\">\n" \ " <ul>\n" \ " <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \ diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts index f5ba461..61c8d6c 100644 --- a/translations/assistant_ru.ts +++ b/translations/assistant_ru.ts @@ -76,10 +76,6 @@ Reason: <translation>Ошибка создания файла коллекции справки '%1': %2.</translation> </message> <message> - <source>Error reading collection file '%1': %2</source> - <translation>Ошибка чтения файла коллекции справки '%1': %2</translation> - </message> - <message> <source>Cannot load sqlite database driver!</source> <translation>Не удалось загрузить драйвер баз данных sqlite!</translation> </message> @@ -112,6 +108,17 @@ Reason: </message> </context> <context> + <name>BookmarkItem</name> + <message> + <source>New Folder</source> + <translation>Новая папка</translation> + </message> + <message> + <source>Untitled</source> + <translation>Безымянная</translation> + </message> +</context> +<context> <name>BookmarkManager</name> <message> <source>Remove</source> @@ -131,7 +138,7 @@ Reason: </message> <message> <source>Untitled</source> - <translation>Неозаглавлено</translation> + <translation>Безымянная</translation> </message> <message> <source>Manage Bookmarks...</source> @@ -329,6 +336,64 @@ Reason: <translation>Файл коллекции справки '%1' не существует.</translation> </message> <message> + <source>Usage: assistant [Options] + +-collectionFile file Uses the specified collection + file instead of the default one +-showUrl url Shows the document with the + url. +-enableRemoteControl Enables Assistant to be + remotely controlled. +-show widget Shows the specified dockwidget + which can be "contents", "index", + "bookmarks" or "search". +-activate widget Activates the specified dockwidget + which can be "contents", "index", + "bookmarks" or "search". +-hide widget Hides the specified dockwidget + which can be "contents", "index" + "bookmarks" or "search". +-register helpFile Registers the specified help file + (.qch) in the given collection + file. +-unregister helpFile Unregisters the specified help file + (.qch) from the give collection + file. +-setCurrentFilter filter Set the filter as the active filter. +-remove-search-index Removes the full text search index. +-rebuild-search-index Re-builds the full text search index (potentially slow). +-quiet Does not display any error or + status message. +-help Displays this help. +</source> + <translation>Использование: assistant [ОПЦИИ] + +-collectionFile файл Использовать указанный файл коллекции, + вместо стандартного +-showUrl ссылка Отобразить документ по ссылке. +-enableRemoteControl Включение удалённого управления Assistant. +-show виджет Отображение указанного прикрепляемого виджета, + который может быть "contents", "index", + "bookmarks" или "search". +-activate виджет Включение указанного прикрепляемого виджета, + который может быть "contents", "index", + "bookmarks" или "search". +-hide виджет Скрытие указанного прикрепляемого виджета, + который может быть "contents", "index", + "bookmarks" или "search". +-register файлСправки Регистрация указанного файла справки (.qch) + в данном файле коллекции. +-unregister файлСправки Отмена регистрации указанного файла + справки (.qch) в данном файле коллекции. +-setCurrentFilter фильтр Активация указанного фильтра. +-remove-search-index Удаление индекса полнотекстового поиска. +-rebuild-search-index Пересоздание индекса полнотекстового поиска + (потенциально медленно). +-quiet Не отображать сообщения об ошибках и состояниях. +-help Показать эту справку. +</translation> + </message> + <message> <source>Missing collection file.</source> <translation>Отсутствует файл коллекции справки.</translation> </message> @@ -377,6 +442,56 @@ Reason: </message> </context> <context> + <name>ConversionWizard</name> + <message> + <source>Help Conversion Wizard</source> + <translation>Мастер преобразования справки</translation> + </message> + <message> + <source>Converting %1...</source> + <translation>Преобразование %1...</translation> + </message> + <message> + <source>Writing help collection file...</source> + <translation>Запись файла коллекции справки...</translation> + </message> + <message> + <source>Done.</source> + <translation>Готово.</translation> + </message> +</context> +<context> + <name>FilesPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Files:</source> + <translation>Файлы:</translation> + </message> + <message> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <source>Remove All</source> + <translation>Удалить всё</translation> + </message> + <message> + <source>Unreferenced Files</source> + <translation>Невостребованные файлы</translation> + </message> + <message> + <source>Remove files which are neither referenced by a keyword nor by the TOC.</source> + <translation>Удаление файлов, на которые нет ссылок ни по ключевым словам, ни в содержании.</translation> + </message> + <message> + <source><p><b>Warning:</b> When removing images or stylesheets, be aware that those files are not directly referenced by the .adp or .dcf file.</p></source> + <translation><p><b>Внимание:</b> при удалении изображений или таблиц стилей следует убедиться, что на эти файлы напрямую не ссылается файл .adp или .dcf.</p></translation> + </message> +</context> +<context> <name>FilterNameDialogClass</name> <message> <source>Add Filter Name</source> @@ -388,6 +503,66 @@ Reason: </message> </context> <context> + <name>FilterPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Filter attributes for current documentation (comma separated list):</source> + <translation>Атрибуты фильтра для текущей документации (список, разделённый запятыми):</translation> + </message> + <message> + <source>Custom Filters</source> + <translation>Пользовательские фильтры</translation> + </message> + <message> + <source>1</source> + <translation></translation> + </message> + <message> + <source>2</source> + <translation></translation> + </message> + <message> + <source>Add</source> + <translation>Добавить</translation> + </message> + <message> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <source>Filter Settings</source> + <translation>Настройки фильтра</translation> + </message> + <message> + <source>Specify the filter attributes for the documentation. If filter attributes are used, also define a custom filter for it. Both the filter attributes and the custom filters are optional.</source> + <translation>Укажите атрибуты фильтра для документации. Если атрибуты фильтра используются, также укажите пользовательский фильтр для них. Атрибуты и пользовательский фильтр необязательны.</translation> + </message> + <message> + <source>Filter Name</source> + <translation>Название фильтра</translation> + </message> + <message> + <source>Filter Attributes</source> + <translation>Атрибуты фильтра</translation> + </message> + <message> + <source>The custom filter '%1' is defined multiple times.</source> + <translation>Пользовательский фильтр "%1" определён несколько раз.</translation> + </message> + <message> + <source>The attributes for custom filter '%1' are defined multiple times.</source> + <translation>Атрибуты для пользовательского фильтра "%1" определены несколько раз.</translation> + </message> + <message> + <source>unfiltered</source> + <comment>list of available documentation</comment> + <translation>вся документация</translation> + </message> +</context> +<context> <name>FindWidget</name> <message> <source>Previous</source> @@ -407,6 +582,17 @@ Reason: </message> </context> <context> + <name>FinishPage</name> + <message> + <source>Converting File</source> + <translation>Преобразование файла</translation> + </message> + <message> + <source>Creating the new Qt help files from the old ADP file.</source> + <translation>Создание файлов справки Qt из старых файлов ADP.</translation> + </message> +</context> +<context> <name>FontPanel</name> <message> <source>Font</source> @@ -430,6 +616,59 @@ Reason: </message> </context> <context> + <name>GeneralPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Namespace:</source> + <translation>Пространство имён:</translation> + </message> + <message> + <source>Virtual Folder:</source> + <translation>Виртуальный каталог:</translation> + </message> + <message> + <source>General Settings</source> + <translation>Основные настройки</translation> + </message> + <message> + <source>Specify the namespace and the virtual folder for the documentation.</source> + <translation>Укажите пространство имён и виртуальный каталог для документации.</translation> + </message> + <message> + <source>Namespace Error</source> + <translation>Ошибка пространства имён</translation> + </message> + <message> + <source>The namespace contains some invalid characters.</source> + <translation>Пространство имён содержит недопустимые символы.</translation> + </message> + <message> + <source>Virtual Folder Error</source> + <translation>Ошибка виртуального каталога</translation> + </message> + <message> + <source>The virtual folder contains some invalid characters.</source> + <translation>Виртуальный каталог содержит недопустимые символы.</translation> + </message> +</context> +<context> + <name>HelpEngineWrapper</name> + <message> + <source>Unfiltered</source> + <translation>Вся документация</translation> + </message> +</context> +<context> + <name>HelpGenerator</name> + <message> + <source>Warning: %1</source> + <translation>Предупреждение: %1</translation> + </message> +</context> +<context> <name>HelpViewer</name> <message> <source><title>about:blank</title></source> @@ -453,6 +692,40 @@ Reason: </message> </context> <context> + <name>HelpWindow</name> + <message> + <source><center><b>Wizard Assistant</b></center></source> + <translation><center><b>Помощь по мастеру преобразования справки</b></center></translation> + </message> +</context> +<context> + <name>IdentifierPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Create identifiers</source> + <translation>Создавать идентификаторы</translation> + </message> + <message> + <source>Global prefix:</source> + <translation>Глобальный префикс:</translation> + </message> + <message> + <source>Inherit prefix from file names</source> + <translation>Наследовать префикс из имён файлов</translation> + </message> + <message> + <source>Identifiers</source> + <translation>Идентификаторы</translation> + </message> + <message> + <source>This page allows you to create identifiers from the keywords found in the .adp or .dcf file.</source> + <translation>Данная страница позволяет создавать идентификаторы из ключевых слов найденных в файле .adp или .dcf.</translation> + </message> +</context> +<context> <name>IndexWindow</name> <message> <source>&Look for:</source> @@ -468,6 +741,53 @@ Reason: </message> </context> <context> + <name>InputPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>File name:</source> + <translation>Имя файла:</translation> + </message> + <message> + <source>...</source> + <translation></translation> + </message> + <message> + <source>Input File</source> + <translation>Исходный файл</translation> + </message> + <message> + <source>Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format.</source> + <translation>Укажите файл .adp или .dcf, который необходимо преобразовать в формат нового проекта справки Qt или коллекции.</translation> + </message> + <message> + <source>Open file</source> + <translation>Открыть файл</translation> + </message> + <message> + <source>Qt Help Files (*.adp *.dcf)</source> + <translation>Файлы справки Qt (*.adp *.dcf)</translation> + </message> + <message> + <source>File Open Error</source> + <translation>Ошибка открытия файла</translation> + </message> + <message> + <source>The specified file could not be opened!</source> + <translation>Не удалось открыть указанный файл!</translation> + </message> + <message> + <source>File Parsing Error</source> + <translation>Ошибка обработки файла</translation> + </message> + <message> + <source>Parsing error in line %1!</source> + <translation>Возникла ошибка обработки на строке %1!</translation> + </message> +</context> +<context> <name>InstallDialog</name> <message> <source>Install Documentation</source> @@ -715,6 +1035,10 @@ Reason: <translation>&Закладки</translation> </message> <message> + <source><center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p></source> + <translation><center><h3>%1</h3><p>Версия %2</p></center><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p></translation> + </message> + <message> <source>Could not register file '%1': %2</source> <translation>Не удалось зарегистрировать файл '%1': %2</translation> </message> @@ -776,7 +1100,93 @@ Reason: </message> <message> <source>Updating search index</source> - <translation>Обновление поискового индекса</translation> + <translation>Обновление индекса полнотекстового поиска</translation> + </message> +</context> +<context> + <name>OutputPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Project file name:</source> + <translation>Имя файла проекта:</translation> + </message> + <message> + <source>Collection file name:</source> + <translation>Имя файла коллекции:</translation> + </message> + <message> + <source>Output File Names</source> + <translation>Имена выходных файлов</translation> + </message> + <message> + <source>Specify the file names for the output files.</source> + <translation>Укажите имена выходных файлов.</translation> + </message> + <message> + <source>Convert...</source> + <translation>Преобразовать...</translation> + </message> + <message> + <source>Qt Help Project File</source> + <translation>Файл проекта справки Qt</translation> + </message> + <message> + <source>Qt Help Collection Project File</source> + <translation>Файл проекта коллекции справки Qt</translation> + </message> + <message> + <source>The specified file %1 already exist. + +Do you want to remove it?</source> + <translation>Файл %1 уже существует. + +Желаете удалить его?</translation> + </message> + <message> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <source>Cancel</source> + <translation>Отмена</translation> + </message> +</context> +<context> + <name>PathPage</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>File filters:</source> + <translation>Фильтры файлов:</translation> + </message> + <message> + <source>Documentation source file paths:</source> + <translation>Пути к исходным файлам документации:</translation> + </message> + <message> + <source>Add</source> + <translation>Добавить</translation> + </message> + <message> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <source>Source File Paths</source> + <translation>Пути к исходным файлам</translation> + </message> + <message> + <source>Specify the paths where the sources files are located. By default, all files in those directories matched by the file filter will be included.</source> + <translation>Укажите пути, где расположены исходные файлы. По умолчанию, будут включены все файлы в каталогах, соответствующие фильтру файлов.</translation> + </message> + <message> + <source>Source File Path</source> + <translation>Путь к исходному файлу</translation> </message> </context> <context> @@ -914,6 +1324,165 @@ Reason: </message> </context> <context> + <name>QCollectionGenerator</name> + <message> + <source>Unknown token at line %1.</source> + <translation>Неизвестный токен в строке %1.</translation> + </message> + <message> + <source>Unknown token at line %1. Expected "QtHelpCollectionProject".</source> + <translation>Неизвестный токен в строке %1. Ожидался "QtHelpCollectionProject".</translation> + </message> + <message> + <source>Missing end tags.</source> + <translation>Отсутствуют завершающие теги.</translation> + </message> + <message> + <source>Missing input or output file for help file generation.</source> + <translation>Отсутствует входной или выходной файл для создания файла справки.</translation> + </message> + <message> + <source>Missing output file name.</source> + <translation>Отсутствует имя выходного файла.</translation> + </message> + <message> + <source>Qt Collection Generator version 1.0 (Qt %1) +</source> + <translation>Генератор коллекций Qt версии 1.0 (Qt %1) +</translation> + </message> + <message> + <source>Missing collection config file.</source> + <translation>Отсутствует файл настроек коллекции.</translation> + </message> + <message> + <source> +Usage: + +qcollectiongenerator <collection-config-file> [options] + + -o <collection-file> Generates a collection file + called <collection-file>. If + this option is not specified + a default name will be used. + -v Displays the version of + qcollectiongenerator. + +</source> + <translation> +Использование: + +qcollectiongenerator <файл-конфигурации-коллекции> [ОПЦИИ] + + -o <файл-коллекции> Создание файла коллекции с именем + <файл-коллекции>. Если эта опция не указана, + будет использовано имя по умолчанию. + -v Показать версию qcollectiongenerator. + +</translation> + </message> + <message> + <source>Could not open %1. +</source> + <translation>Не удалось открыть %1.</translation> + </message> + <message> + <source>Reading collection config file... +</source> + <translation>Чтение файла конфигурации коллекции... +</translation> + </message> + <message> + <source>Collection config file error: %1 +</source> + <translation>Ошибка файла конфигурации коллекции: %1 +</translation> + </message> + <message> + <source>Generating help for %1... +</source> + <translation>Создание справки для %1...</translation> + </message> + <message> + <source>Creating collection file... +</source> + <translation>Создание файла коллекции...</translation> + </message> + <message> + <source>The file %1 cannot be overwritten. +</source> + <translation>Файл %1 не может быть перезаписан.</translation> + </message> + <message> + <source>Cannot open %1. +</source> + <translation>Не удалось открыть %1.</translation> + </message> + <message> + <source>Cannot open referenced image file %1. +</source> + <translation>Не удалось открыть необходимый файл изображения %1. +</translation> + </message> +</context> +<context> + <name>QHelpGenerator</name> + <message> + <source>Missing output file name.</source> + <translation>Отсутствует имя выходного файла.</translation> + </message> + <message> + <source>Qt Help Generator version 1.0 (Qt %1) +</source> + <translation>Генератор справки Qt, версия 1.0 (Qt %1) +</translation> + </message> + <message> + <source>Missing Qt help project file.</source> + <translation>Отсутствует файл проекта справки Qt.</translation> + </message> + <message> + <source> +Usage: + +qhelpgenerator <help-project-file> [options] + + -o <compressed-file> Generates a Qt compressed help + file called <compressed-file>. + If this option is not specified + a default name will be used. + -c Checks whether all links in HTML files + point to files in this help project. + -v Displays the version of + qhelpgenerator. + +</source> + <translation> +Использование: + +qhelpgenerator <файл-проекта-справки> [ОПЦИИ] + + -o <сжатый-файл> Создание сжатого файла справки Qt под именем + <сжатый-файл>. Если эта опция не указана, + будет использоваться имя по умолчанию. + -c Проверка на то, чтобы все ссылки в файлах + HTML указывали на файлы в этом проекте. + -v Отображение версии qhelpgenerator. + +</translation> + </message> + <message> + <source>Could not open %1. +</source> + <translation>Не удалось открыть %1.</translation> + </message> + <message> + <source>Could not create output directory: %1 +</source> + <translation>Не удалось создать каталог: %1</translation> + </message> +</context> +<context> <name>RemoteControl</name> <message> <source>Debugging Remote Control</source> diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts index 89977b1..d6ab18e 100644 --- a/translations/designer_ru.ts +++ b/translations/designer_ru.ts @@ -25,6 +25,49 @@ </message> </context> <context> + <name>AbstractItemEditor</name> + <message> + <source>Selectable</source> + <translation></translation> + </message> + <message> + <source>Editable</source> + <translation></translation> + </message> + <message> + <source>DragEnabled</source> + <translation></translation> + </message> + <message> + <source>DropEnabled</source> + <translation></translation> + </message> + <message> + <source>UserCheckable</source> + <translation></translation> + </message> + <message> + <source>Enabled</source> + <translation></translation> + </message> + <message> + <source>Tristate</source> + <translation></translation> + </message> + <message> + <source>Unchecked</source> + <translation></translation> + </message> + <message> + <source>PartiallyChecked</source> + <translation></translation> + </message> + <message> + <source>Checked</source> + <translation></translation> + </message> +</context> +<context> <name>AddLinkDialog</name> <message> <source>Insert Link</source> @@ -304,7 +347,7 @@ </message> <message> <source>Change Z-order of '%1'</source> - <translation type="unfinished">Изменить порядок удалённости '%1'</translation> + <translation>Изменить порядок удалённости '%1'</translation> </message> <message> <source>Raise '%1'</source> @@ -324,11 +367,11 @@ </message> <message> <source>Promote to custom widget</source> - <translation type="unfinished">Преобразовать в пользовательский виджет</translation> + <translation>Преобразовать в пользовательский виджет</translation> </message> <message> <source>Demote from custom widget</source> - <translation type="unfinished">Преобразовать из пользовательского виджета</translation> + <translation>Преобразовать из пользовательского виджета</translation> </message> <message> <source>Lay out using grid</source> @@ -348,7 +391,7 @@ </message> <message> <source>Simplify Grid Layout</source> - <translation type="unfinished">Упрощённая компоновка по сетке</translation> + <translation>Упрощённая компоновка по сетке</translation> </message> <message> <source>Move Page</source> @@ -396,7 +439,7 @@ </message> <message> <source>Add Dock Window</source> - <translation type="unfinished">Добавить прикрепляемое окно</translation> + <translation>Добавить прикрепляемое окно</translation> </message> <message> <source>Adjust Size of '%1'</source> @@ -404,11 +447,11 @@ </message> <message> <source>Change Form Layout Item Geometry</source> - <translation type="unfinished">Изменить геометрию элементов компоновки столбцами</translation> + <translation>Изменить геометрию элемента компоновки столбцами</translation> </message> <message> <source>Change Layout Item Geometry</source> - <translation type="unfinished">Изменить геометрию элементов компоновки</translation> + <translation>Изменить геометрию элемента компоновки</translation> </message> <message> <source>Delete Subwindow</source> @@ -653,7 +696,7 @@ </message> <message> <source>Promoted Widgets</source> - <translation type="unfinished">Преобразованные виджеты</translation> + <translation>Преобразованные виджеты</translation> </message> <message> <source>Unable to launch %1.</source> @@ -777,7 +820,7 @@ <message> <source>Embedded Design</source> <extracomment>Tab in preferences dialog</extracomment> - <translation type="unfinished">Оформление портативных устройств</translation> + <translation>Оформление портативных устройств</translation> </message> <message> <source>Device Profiles</source> @@ -852,6 +895,7 @@ Parsing grid layout minimum size values</extracomment> <name>FormEditorOptionsPage</name> <message> <source>%1 %</source> + <extracomment>Zoom percentage</extracomment> <translation>%1 %</translation> </message> <message> @@ -876,7 +920,7 @@ Parsing grid layout minimum size values</extracomment> <name>FormLayoutRowDialog</name> <message> <source>Add Form Layout Row</source> - <translation type="unfinished">Добавление строки компоновщика формы</translation> + <translation>Добавление строки компоновщика столбцами (QFormLayout)</translation> </message> <message> <source>&Label text:</source> @@ -962,7 +1006,7 @@ Parsing grid layout minimum size values</extracomment> </message> <message> <source>Embedded Design</source> - <translation type="unfinished">Оформление портативных устройств</translation> + <translation>Оформление портативных устройств</translation> </message> </context> <context> @@ -1131,7 +1175,7 @@ Parsing grid layout minimum size values</extracomment> <message> <source>Not used</source> <extracomment>Usage of promoted widgets</extracomment> - <translation>Не используется</translation> + <translation>Не используются</translation> </message> </context> <context> @@ -1205,11 +1249,11 @@ This indicates an inconsistency in the ui-file.</source> <name>QAxWidgetTaskMenu</name> <message> <source>Set Control</source> - <translation>Установить элемент управления</translation> + <translation>Задать элемент управления</translation> </message> <message> <source>Reset Control</source> - <translation type="unfinished">Удалить элемент управления</translation> + <translation>Сбросить элемент управления</translation> </message> <message> <source>Licensed Control</source> @@ -1224,7 +1268,7 @@ This indicates an inconsistency in the ui-file.</source> <name>QCoreApplication</name> <message> <source>%1 is not a promoted class.</source> - <translation type="unfinished">%1 не является преобразованным классом.</translation> + <translation>%1 не является преобразованным классом.</translation> </message> <message> <source>The base class %1 is invalid.</source> @@ -1236,7 +1280,7 @@ This indicates an inconsistency in the ui-file.</source> </message> <message> <source>Promoted Widgets</source> - <translation type="unfinished">Преобразованные виджеты</translation> + <translation>Преобразованные виджеты</translation> </message> <message> <source>The class %1 cannot be removed</source> @@ -1567,11 +1611,11 @@ Would you like to retry?</source> <name>QDesignerAxWidget</name> <message> <source>Reset control</source> - <translation type="unfinished">Сбросить элемент управления</translation> + <translation>Сбросить элемент управления</translation> </message> <message> <source>Set control</source> - <translation>Установить элемент управления</translation> + <translation>Задать элемент управления</translation> </message> <message> <source>Control loaded</source> @@ -1579,7 +1623,7 @@ Would you like to retry?</source> </message> <message> <source>A COM exception occurred when executing a meta call of type %1, index %2 of "%3".</source> - <translation type="unfinished">Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 "%3".</translation> + <translation>Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 в "%3".</translation> </message> </context> <context> @@ -1838,7 +1882,7 @@ Container pages should only be added by specifying them in XML returned by the d </message> <message> <source>Backup Information</source> - <translation type="unfinished">Информация о резервированых копиях</translation> + <translation>Информация о резервных копиях</translation> </message> <message> <source>The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them?</source> @@ -2232,27 +2276,27 @@ Empty class name passed to widget factory method</extracomment> </message> <message> <source>Linear</source> - <translation type="unfinished">Линейный</translation> + <translation>Линейный</translation> </message> <message> <source>Radial</source> - <translation type="unfinished">Радиальный</translation> + <translation>Радиальный</translation> </message> <message> <source>Conical</source> - <translation type="unfinished">Конический</translation> + <translation>Конический</translation> </message> <message> <source>Pad</source> - <translation type="unfinished">Равномерная</translation> + <translation>Равномерная</translation> </message> <message> <source>Repeat</source> - <translation type="unfinished">Цикличная</translation> + <translation>Цикличная</translation> </message> <message> <source>Reflect</source> - <translation type="unfinished">Зеркальная</translation> + <translation>Зеркальная</translation> </message> <message> <source>Form</source> @@ -2514,6 +2558,10 @@ Empty class name passed to widget factory method</extracomment> <context> <name>QtLocalePropertyManager</name> <message> + <source><Invalid></source> + <translation><Некорректное значение></translation> + </message> + <message> <source>%1, %2</source> <translation>%1, %2</translation> </message> @@ -2651,7 +2699,7 @@ Do you want to replace it?</source> </message> <message> <source>newPrefix</source> - <translation type="unfinished">newPrefix</translation> + <translation type="unfinished"></translation> </message> <message> <source><p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p></source> @@ -2883,7 +2931,7 @@ to <name>QtSizePolicyPropertyManager</name> <message> <source><Invalid></source> - <translation><Неверный></translation> + <translation><Некорректное значение></translation> </message> <message> <source>[%1, %2, %3, %4]</source> @@ -3174,23 +3222,23 @@ Do you want overwrite the template?</source> </message> <message> <source>Dock views</source> - <translation type="unfinished">Прикрепляемые панели</translation> + <translation>Прикрепляемые панели</translation> </message> <message> <source>File</source> - <translation type="unfinished">Файл</translation> + <translation>Файл</translation> </message> <message> <source>Edit</source> - <translation type="unfinished">Правка</translation> + <translation>Правка</translation> </message> <message> <source>Tools</source> - <translation type="unfinished">Инструменты</translation> + <translation>Инструменты</translation> </message> <message> <source>Form</source> - <translation type="unfinished">Форма</translation> + <translation>Форма</translation> </message> <message> <source>Toolbars</source> @@ -3220,11 +3268,11 @@ Do you want overwrite the template?</source> <name>VideoPlayerTaskMenu</name> <message> <source>Available Mime Types</source> - <translation type="unfinished">Доступные типы данных</translation> + <translation>Доступные типы данных</translation> </message> <message> <source>Display supported mime types...</source> - <translation type="unfinished">Показывать поддерживаемые типы данных...</translation> + <translation>Показать поддерживаемые типы данных...</translation> </message> <message> <source>Load...</source> @@ -3306,11 +3354,11 @@ Do you want overwrite the template?</source> </message> <message> <source>Icon View</source> - <translation type="unfinished">Значки</translation> + <translation>Значки</translation> </message> <message> <source>Detailed View</source> - <translation type="unfinished">Подробно</translation> + <translation>Подробно</translation> </message> <message> <source>New action</source> @@ -3902,7 +3950,7 @@ Do you want overwrite the template?</source> <name>qdesigner_internal::FormLayoutMenu</name> <message> <source>Add form layout row...</source> - <translation>Добавить строку компоновщика формы...</translation> + <translation>Добавить строку компоновки в 2 столбца...</translation> </message> </context> <context> @@ -3953,7 +4001,7 @@ Do you want overwrite the template?</source> </message> <message> <source>Cannot paste widgets. Designer could not find a container without a layout to paste into.</source> - <translation type="unfinished">Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов.</translation> + <translation>Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов.</translation> </message> <message> <source>Break the layout of the container you want to paste into, select this container and then paste again.</source> @@ -4083,11 +4131,11 @@ Do you want overwrite the template?</source> </message> <message> <source>Lay Out in a &Form Layout</source> - <translation>Скомпоновать в &две колонки</translation> + <translation>Скомпоновать в &два столбца</translation> </message> <message> <source>Lays out the selected widgets in a form layout</source> - <translation>Компонует выделенные виджеты в две колонки (QFormLayout)</translation> + <translation>Компонует выделенные виджеты в два столбца (QFormLayout)</translation> </message> <message> <source>Lay Out in a &Grid</source> @@ -4548,7 +4596,7 @@ Please select another name.</source> </message> <message> <source>Embedded Design</source> - <translation type="unfinished">Оформление портативных устройств</translation> + <translation>Оформление портативных устройств</translation> </message> <message> <source>Device:</source> @@ -4567,7 +4615,7 @@ Please select another name.</source> </message> <message> <source>New Promoted Class</source> - <translation type="unfinished">Новый преобразованный класс</translation> + <translation>Новый преобразованный класс</translation> </message> <message> <source>Base class name:</source> @@ -4575,7 +4623,7 @@ Please select another name.</source> </message> <message> <source>Promoted class name:</source> - <translation type="unfinished">Имя преобразованного класса:</translation> + <translation>Имя преобразованного класса:</translation> </message> <message> <source>Header file:</source> @@ -4644,7 +4692,7 @@ Please select another name.</source> </message> <message> <source>Compute Details</source> - <translation type="unfinished">Расчитывать детали</translation> + <translation type="unfinished">Рассчитывать детали</translation> </message> <message> <source>Quick</source> @@ -4671,7 +4719,7 @@ Please select another name.</source> <name>qdesigner_internal::PaletteEditorButton</name> <message> <source>Change Palette</source> - <translation type="unfinished">Изменить палитру</translation> + <translation>Изменить палитру</translation> </message> </context> <context> @@ -4742,6 +4790,14 @@ Please select another name.</source> <translation>Поиск вновь установленных модулей пользовательских виджетов.</translation> </message> <message> + <source>Loaded Plugins</source> + <translation>Загруженные модули</translation> + </message> + <message> + <source>Failed Plugins</source> + <translation>Незагруженные модули</translation> + </message> + <message> <source>Qt Designer couldn't find any plugins</source> <translation>Qt Designer не может найти ни одного модуля</translation> </message> @@ -4898,7 +4954,7 @@ ate the goose who was loose.</source> </message> <message> <source>Global include</source> - <translation>Глобальное включение</translation> + <translation type="unfinished">Глобальное включение</translation> </message> <message> <source>Usage</source> @@ -4909,11 +4965,11 @@ ate the goose who was loose.</source> <name>qdesigner_internal::PromotionTaskMenu</name> <message> <source>Promoted widgets...</source> - <translation type="unfinished">Преобразованные виджеты...</translation> + <translation>Преобразованные виджеты...</translation> </message> <message> <source>Promote to ...</source> - <translation type="unfinished">Преобразовать в ...</translation> + <translation>Преобразовать в ...</translation> </message> <message> <source>Change signals/slots...</source> @@ -4921,11 +4977,11 @@ ate the goose who was loose.</source> </message> <message> <source>Promote to</source> - <translation type="unfinished">Преобразовать в</translation> + <translation>Преобразовать в</translation> </message> <message> <source>Demote to %1</source> - <translation type="unfinished">Преобразовать в %1</translation> + <translation>Преобразовать в %1</translation> </message> </context> <context> @@ -4988,15 +5044,15 @@ Class: %2</source> <name>qdesigner_internal::QDesignerPromotionDialog</name> <message> <source>Promoted Widgets</source> - <translation type="unfinished">Преобразованные виджеты</translation> + <translation>Преобразованные виджеты</translation> </message> <message> <source>Promoted Classes</source> - <translation type="unfinished">Преобразованные классы</translation> + <translation>Преобразованные классы</translation> </message> <message> <source>Promote</source> - <translation type="unfinished">Преобразовать</translation> + <translation>Преобразовать</translation> </message> <message> <source>Change signals/slots...</source> @@ -5227,7 +5283,7 @@ Class: %2</source> </message> <message> <source>Source</source> - <translation type="unfinished">Исходник</translation> + <translation>Исходник</translation> </message> <message> <source>&OK</source> @@ -5600,7 +5656,7 @@ Class: %2</source> </message> <message> <source>Edit Tree Widget</source> - <translation type="unfinished">Изменение виджета Дерево</translation> + <translation>Изменение виджета Дерево</translation> </message> <message> <source>&Items</source> @@ -5681,7 +5737,7 @@ Class: %2</source> <name>qdesigner_internal::WidgetBoxTreeWidget</name> <message> <source>Scratchpad</source> - <translation type="unfinished">Блокнот</translation> + <translation>Блокнот</translation> </message> <message> <source>Custom Widgets</source> @@ -5742,7 +5798,7 @@ Class: %2</source> </message> <message> <source>The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget.</source> - <translation type="unfinished">При создании компоновщика не удалось определить текущую страницу контейнера '%1' (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для контейнерного виджета.</translation> + <translation>При создании компоновщика не удалось определить текущую страницу контейнера '%1' (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для виджета контейнерного типа.</translation> </message> <message> <source>Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts index 2d06f25..3b448a0 100644 --- a/translations/linguist_ru.ts +++ b/translations/linguist_ru.ts @@ -258,6 +258,191 @@ Will assume a single universal form.</source> </message> </context> <context> + <name>LConvert</name> + <message> + <source> +Usage: + lconvert [options] <infile> [<infile>...] + +lconvert is part of Qt's Linguist tool chain. It can be used as a +stand-alone tool to convert and filter translation data files. +The following file formats are supported: + +%1 +If multiple input files are specified, they are merged with +translations from later files taking precedence. + +Options: + -h + --help Display this information and exit. + + -i <infile> + --input-file <infile> + Specify input file. Use if <infile> might start with a dash. + This option can be used several times to merge inputs. + May be '-' (standard input) for use in a pipe. + + -o <outfile> + --output-file <outfile> + Specify output file. Default is '-' (standard output). + + -if <informat> + --input-format <format> + Specify input format for subsequent <infile>s. + The format is auto-detected from the file name and defaults to 'ts'. + + -of <outformat> + --output-format <outformat> + Specify output format. See -if. + + --input-codec <codec> + Specify encoding for QM and PO input files. Default is 'Latin1' + for QM and 'UTF-8' for PO files. UTF-8 is always tried as well for + QM, corresponding to the possible use of the trUtf8() function. + + --output-codec <codec> + Specify encoding for PO output files. Default is 'UTF-8'. + + --drop-tags <regexp> + Drop named extra tags when writing TS or XLIFF files. + May be specified repeatedly. + + --drop-translations + Drop existing translations and reset the status to 'unfinished'. + Note: this implies --no-obsolete. + + --source-language <language>[_<region>] + Specify/override the language of the source strings. Defaults to + POSIX if not specified and the file does not name it yet. + + --target-language <language>[_<region>] + Specify/override the language of the translation. + The target language is guessed from the file name if this option + is not specified and the file contents name no language yet. + + --no-obsolete + Drop obsolete messages. + + --no-finished + Drop finished messages. + + --sort-contexts + Sort contexts in output TS file alphabetically. + + --locations {absolute|relative|none} + Override how source code references are saved in TS files. + Default is absolute. + + --no-ui-lines + Drop line numbers from references to UI files. + + --verbose + be a bit more verbose + +Long options can be specified with only one leading dash, too. + +Return value: + 0 on success + 1 on command line parse failures + 2 on read failures + 3 on write failures +</source> + <translation> +Использование: + lconvert [параметры] <входной файл> [<входной файл>...] + +lconvert - это один из инструментов Qt Linguist. Он может быть использован как +для преобразования файлов переводов, так и для обработки файлов переводов. + +Поддерживаются файлы следующих форматов: + +%1 +Если задано несколько входных файлов, то они будут объединены, причем, каждый +последующий файл имеет приоритет над предыдущим. + +Параметры: + -h + --help Отображение данной справки и выход. + + -i <файл> + --input-file <файл> + Указание входного файл. Следует использовать, если <входной файл> + начинается с дефиса. Этот параметр может быть использован несколько + раз для объединения файлов. + Допустимо значение "-" (стандартный ввод) для использования каналов. + + -o <файл> + --output-file <файл> + Указание выходного файла. + По умолчанию значение "-" (стандартный вывод). + + -if <формат> + --input-format <формат> + Указание формата для последующих входных файлов. + Формат определяется автоматически из имени файла. + По умолчанию предполагается "ts". + + -of <формат> + --output-format <формат> + Указание формата выходного файла. См. -if. + + --input-codec <кодировка> + Указание кодировки входных файлов QM и PO. По умолчанию, + используется "Latin1" для QM и "UTF-8" для PO файлов. Так же UTF-8 + всегда применяется для QM, где возможно использование + функции trUtf8(). + + --output-codec <кодировка> + Указание кодировки выходных файлов формата PO. По умолчанию "UTF-8". + + --drop-tags <regexp> + Опустить дополнительные теги, соответствующие регулярному выражению + regexp, при записи файлов TS или XLIFF. + Можно указывать несколько раз. + + --drop-translations + Опустить существующие переводы и сбросить их статус в "незавершено". + Включает действие --no-obsolete. + + --source-language <язык>[_<регион>] + Задание/изменение языка исходных строк. По умолчанию POSIX, если не + указано и файл не содержит язык исходных строк в своём имени. + + --target-language <язык>[_<регион>] + Задание/изменение языка переводов. + Этот язык определяется из имени файла, если этот параметр не задан + или язык не указан внутри файла. + + --no-obsolete + Опустить устаревшие переводы. + + --no-finished + Опустить завершённые переводы. + + --sort-contexts + Упорядочить по алфавиту контекст выходного TS файла. + + --locations {absolute|relative|none} + Изменение метода сохранения ссылок на исходные тексты в TS файлах. + По умолчанию absolute. + + --no-ui-lines + Опустить номера строк в ссылках на UI файлы. + + --verbose + Выводить чуть больше информации. + +Длинные параметры также можно указывать и с одним дефисом. + +Возвращаемые результаты: + 0 в случае успеха + 1 в случае ошибки в командной строке + 2 при ошибке чтения + 3 при ошибки записи +</translation> + </message> +</context> +<context> <name>LRelease</name> <message numerus="yes"> <source>Dropped %n message(s) which had no ID.</source> @@ -291,6 +476,763 @@ Will assume a single universal form.</source> <numerusform> Пропущено %n непереведённых исходных текстов</numerusform> </translation> </message> + <message> + <source>Usage: + lrelease [options] project-file + lrelease [options] ts-files [-qm qm-file] + +lrelease is part of Qt's Linguist tool chain. It can be used as a +stand-alone tool to convert XML-based translations files in the TS +format into the 'compiled' QM format used by QTranslator objects. + +Options: + -help Display this information and exit + -idbased + Use IDs instead of source strings for message keying + -compress + Compress the QM files + -nounfinished + Do not include unfinished translations + -removeidentical + If the translated text is the same as + the source text, do not include the message + -markuntranslated <prefix> + If a message has no real translation, use the source text + prefixed with the given string instead + -silent + Do not explain what is being done + -version + Display the version of lrelease and exit +</source> + <translation>Использование: + lrelease [параметры] <файл-проекта> + lrelease [параметры] <ts-файлы> [-qm <qm-файлы>] + +lrelease - это один из инструментов Qt Linguist. Он может быть использован для +преобразования переводов, основанных на формате TS в "скомпилированный" +формат QM, используемый объектами QTranslator. + +Параметры: + -help + Отобразить данную справку и выйти + -idbased + Использовать ID вместо исходных строк для индексирования сообщений + -compress + Сжать файл QM + -nounfinished + Не включать незавершённые переводы + -removeidentical + Не включать переводы, совпадающие с исходным текстом + -markuntranslated <приставка> + Если сообщение не имеет перевода, то использовать исходный текст + с указанной приставкой + -silent + Не отчитываться о производимых действиях + -version + Отобразить текущую версию lrelease и выйти +</translation> + </message> + <message> + <source>lrelease error: %1</source> + <translation>lrelease ошибка: %1</translation> + </message> + <message> + <source>Updating '%1'... +</source> + <translation>Обновление '%1'... +</translation> + </message> + <message> + <source>Removing translations equal to source text in '%1'... +</source> + <translation>Удаление переводов для '%1'... +</translation> + </message> + <message> + <source>lrelease error: cannot create '%1': %2 +</source> + <translation>lrelease ошибка: не удалось создать '%1': %2</translation> + </message> + <message> + <source>lrelease error: cannot save '%1': %2</source> + <translation>lrelease ошибка: не удалось сохранить '%1': %2</translation> + </message> + <message> + <source>lrelease version %1 +</source> + <translation>lrelease версия %1 +</translation> + </message> + <message> + <source>lrelease error: cannot read project file '%1'. +</source> + <translation>lrelease ошибка: не удалось прочитать файл проекта '%1'.</translation> + </message> + <message> + <source>lrelease error: cannot process project file '%1'. +</source> + <translation>lrelease ошибка: не удалось обработать файл проекта '%1'.</translation> + </message> + <message> + <source>lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1' +</source> + <translation>lrelease ошибка: в файле проекта '%1' отсутствует запись 'TRANSLATIONS'</translation> + </message> +</context> +<context> + <name>LUpdate</name> + <message> + <source>Parenthesis/bracket/brace mismatch between #if and #else branches; using #if branch +</source> + <translation>Несовпадение скобок (круглых, квадратных или фигурных) между ветками #if и #else; используется ветка #if +</translation> + </message> + <message> + <source>Parenthesis/brace mismatch between #if and #else branches; using #if branch +</source> + <translation>Несовпадение скобок (круглых или фигурных) между ветками #if и #else; используется ветка #if +</translation> + </message> + <message> + <source>Unterminated C++ comment +</source> + <translation>Незавершённый комментарий C++ +</translation> + </message> + <message> + <source>Unterminated C++ string +</source> + <translation>Незавершённая строка C++ +</translation> + </message> + <message> + <source>Excess closing brace in C++ code (or abuse of the C++ preprocessor) +</source> + <translation>Лишняя закрывающая фигурная скобка в C++ коде (или злоупотребление препроцессором C++) +</translation> + </message> + <message> + <source>Excess closing parenthesis in C++ code (or abuse of the C++ preprocessor) +</source> + <translation>Лишняя закрывающая круглая скобка в C++ коде (или злоупотребление препроцессором C++) +</translation> + </message> + <message> + <source>Excess closing bracket in C++ code (or abuse of the C++ preprocessor) +</source> + <translation>Лишняя закрывающая квадратная скобка в C++ коде (или злоупотребление препроцессором C++) +</translation> + </message> + <message> + <source>circular inclusion of %1 +</source> + <translation>цикличное включение %1 +</translation> + </message> + <message> + <source>Cannot open %1: %2 +</source> + <translation>Невозможно открыть %1: %2 +</translation> + </message> + <message> + <source>//% cannot be used with tr() / QT_TR_NOOP(). Ignoring +</source> + <translation>//% не может быть использовано совместно с tr() / QT_TR_NOOP(). Пропускается +</translation> + </message> + <message> + <source>Qualifying with unknown namespace/class %1::%2 +</source> + <translation>Уточнение с неизвестным пространством имён/классом %1::%2 +</translation> + </message> + <message> + <source>tr() cannot be called without context +</source> + <translation>tr() не может быть вызван без контекста +</translation> + </message> + <message> + <source>Class '%1' lacks Q_OBJECT macro +</source> + <translation>У класса "%1" отсутствует макрос Q_OBJECT +</translation> + </message> + <message> + <source>It is not recommended to call tr() from within a constructor '%1::%2' +</source> + <translation>Не рекомендуется вызывать tr() в теле конструктора "%1::%2" +</translation> + </message> + <message> + <source>//% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring +</source> + <translation>//% не может быть использовано совместно с translate() / QT_TRANSLATE_NOOP(). Пропускается +</translation> + </message> + <message> + <source>//= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring +</source> + <translation>//= не может быть использовано совместно с qtTrId() / QT_TRID_NOOP(). Пропускается +</translation> + </message> + <message> + <source>Unexpected character in meta string +</source> + <translation>Неожиданный символ в мета-строке +</translation> + </message> + <message> + <source>Unterminated meta string +</source> + <translation>Незавершённая мета-строка +</translation> + </message> + <message> + <source>Cannot invoke tr() like this +</source> + <translation>Использование tr() в том виде, как здесь, не допускается +</translation> + </message> + <message> + <source>Discarding unconsumed meta data +</source> + <translation>Отбрасываются неиспользуемые мета-данные +</translation> + </message> + <message> + <source>Unbalanced opening brace in C++ code (or abuse of the C++ preprocessor) +</source> + <translation>Лишняя открывающая фигурная скобка в C++ коде (или злоупотребление препроцессором C++) +</translation> + </message> + <message> + <source>Unbalanced opening parenthesis in C++ code (or abuse of the C++ preprocessor) +</source> + <translation>Лишняя открывающая круглая скобка в C++ коде (или злоупотребление препроцессором C++) +</translation> + </message> + <message> + <source>Unbalanced opening bracket in C++ code (or abuse of the C++ preprocessor) +</source> + <translation>Лишняя открывающая квадратная скобка в C++ коде (или злоупотребление препроцессором C++) +</translation> + </message> + <message> + <source>Cannot open %1: %2</source> + <translation>Невозможно открыть %1: %2</translation> + </message> + <message> + <source>Unterminated Java comment. +</source> + <translation>Незавершённый комментарий Java. +</translation> + </message> + <message> + <source>Invalid Unicode value. +</source> + <translation>Неверное значение Unicode. +</translation> + </message> + <message> + <source>Unterminated string. +</source> + <translation>Незавершённая строка. +</translation> + </message> + <message> + <source>String used in translation can contain only literals concatenated with other literals, not expressions or numbers. +</source> + <translation>Строка, используемая в переводе, может содержать только строковые литералы (возможно, соединённые с другими литералами), но не выражения или числа. +</translation> + </message> + <message> + <source>'class' must be followed by a class name. +</source> + <translation>После слова "class" должно идти имя класса. +</translation> + </message> + <message> + <source>Excess closing brace. +</source> + <translation>Лишняя закрывающая фигурная скобка. +</translation> + </message> + <message> + <source>'package' must be followed by package name. +</source> + <translation>После слова "package" должно идти имя пакета. +</translation> + </message> + <message> + <source>Unbalanced opening brace. +</source> + <translation>Лишняя открывающая фигурная скобка. +</translation> + </message> + <message> + <source>Unbalanced opening parenthesis. +</source> + <translation>Лишняя открывающая круглая скобка. +</translation> + </message> + <message> + <source>Usage: + lupdate [options] [project-file]... + lupdate [options] [source-file|path|@lst-file]... -ts ts-files|@lst-file + +lupdate is part of Qt's Linguist tool chain. It extracts translatable +messages from Qt UI files, C++, Java and JavaScript/QtScript source code. +Extracted messages are stored in textual translation source files (typically +Qt TS XML). New and modified messages can be merged into existing TS files. + +Options: + -help Display this information and exit. + -no-obsolete + Drop all obsolete strings. + -extensions <ext>[,<ext>]... + Process files with the given extensions only. + The extension list must be separated with commas, not with whitespace. + Default: '%1'. + -pluralonly + Only include plural form messages. + -silent + Do not explain what is being done. + -no-sort + Do not sort contexts in TS files. + -no-recursive + Do not recursively scan the following directories. + -recursive + Recursively scan the following directories (default). + -I <includepath> or -I<includepath> + Additional location to look for include files. + May be specified multiple times. + -locations {absolute|relative|none} + Specify/override how source code references are saved in TS files. + Default is absolute. + -no-ui-lines + Do not record line numbers in references to UI files. + -disable-heuristic {sametext|similartext|number} + Disable the named merge heuristic. Can be specified multiple times. + -pro <filename> + Name of a .pro file. Useful for files with .pro file syntax but + different file suffix. Projects are recursed into and merged. + -source-language <language>[_<region>] + Specify the language of the source strings for new files. + Defaults to POSIX if not specified. + -target-language <language>[_<region>] + Specify the language of the translations for new files. + Guessed from the file name if not specified. + -ts <ts-file>... + Specify the output file(s). This will override the TRANSLATIONS + and nullify the CODECFORTR from possibly specified project files. + -codecfortr <codec> + Specify the codec assumed for tr() calls. Effective only with -ts. + -version + Display the version of lupdate and exit. + @lst-file + Read additional file names (one per line) from lst-file. +</source> + <translation>Использование: + lupdate [параметры] [файл-проекта]... + lupdate [параметры] [исходный-файл|путь|@lst-файл]... -ts ts-файлы|@lst-файл + +lupdate - это один из инструментов Qt Linguist. Он извлекает переводимые строки +из файлов Qt UI, исходных текстов C++, Java и JavaScript/QtScript. Эти строки +сохраняются в текстовых исходных файлах перевода (обычно, Qt TS XML). Новые +или изменённые сообщения могут быть добавлены в существующие TS файлы. + +Параметры: + -help Отобразить эту информацию и выйти. + -no-obsolete + Удалить все устаревшие строки. + -extensions <ext>[,<ext>]... + Обрабатывать файлы, имеющие только указанные расширения. + Список расширений должен быть разделён запятыми, а не пробелами. + По умолчанию: + "%1". + -pluralonly + Включать только множественную форму сообщений. + -silent + Не показывать выполняемые действия. + -no-sort + Не упорядочивать контекст в TS файлах. + -no-recursive + Не сканировать каталоги рекурсивно. + -recursive + Сканировать каталоги рекурсивно (по умолчанию). + -I <путь> or -I<путь> + Дополнительное расположение подключаемых файлов. + Можно указать несколько раз. + -locations {absolute|relative|none} + Изменение метода сохранения ссылок на исходные тексты в TS файлах. + По умолчанию absolute. + -no-ui-lines + Не сохранять номера строк в ссылках на UI файлы. + -disable-heuristic {sametext|similartext|number} + Отключить указанный метод объединения: + sametext - тот же текст + similartext - похожий текст + number - числа + Может указываться несколько раз. + -pro <имя файла> + Название .pro файла. Используется для файлов в формате .pro, но + имеющих другое расширение. Проекты будут объединены и обработаны + рекурсивно. + --source-language <язык>[_<регион>] + Задание/замена языка исходных строк. По умолчанию, POSIX, если не + указано, и файл не содержит его в своём имени. + --target-language <язык>[_<регион>] + Задание/замена языка переводов. + Этот язык определяется из имени файла, если этот параметр не задан + или язык не указан внутри файла. + -ts <ts-файл>... + Указание выходного файла(ов). В этом случае будет заменена + переменная TRANSLATIONS и обнулена CODECFORTR в указанном файле + проекта. + -codecfortr <кодировка> + Указание кодировки, применимой к tr(). + Используется только вместе с -ts. + -version + Отобразить версию lupdate и выйти. + @lst-файл + Прочитать дополнительные имена файлов (по одному на строке) из + файла lst-файл. +</translation> + </message> + <message> + <source>lupdate warning: Codec for tr() '%1' disagrees with existing file's codec '%2'. Expect trouble. +</source> + <translation>Предупреждение lupdate: Кодировка для tr() "%1" не совпадает с кодировкой существующего файла "%2". Возможны проблемы. +</translation> + </message> + <message> + <source>lupdate warning: Specified target language '%1' disagrees with existing file's language '%2'. Ignoring. +</source> + <translation>Предупреждение lupdate: Указанный целевой язык "%1" не совпадает с языком существующего файла "%2". Пропускается. +</translation> + </message> + <message> + <source>lupdate warning: Specified source language '%1' disagrees with existing file's language '%2'. Ignoring. +</source> + <translation>Предупреждение lupdate: Указанный исходный язык "%1" не совпадает с языком существующего файла "%2". Пропускается. +</translation> + </message> + <message> + <source>Updating '%1'... +</source> + <translation>Обновление "%1"... +</translation> + </message> + <message> + <source>Stripping non plural forms in '%1'... +</source> + <translation>Удаление немножественных форм из "%1"... +</translation> + </message> + <message> + <source>lupdate warning: Codec for source '%1' is invalid. Falling back to codec for tr(). +</source> + <translation>Предупреждение lupdate: Некорректная кодировка для исходника "%1". Используется кодировка для tr(). +</translation> + </message> + <message> + <source>lupdate warning: TS files from command line will override TRANSLATIONS in %1. +</source> + <translation>Предупреждение lupdate: TS файлы командной строки заменят TRANSLATIONS в %1. +</translation> + </message> + <message> + <source>lupdate warning: TS files from command line prevent recursing into %1. +</source> + <translation>Предупреждение lupdate: TS файлы командной строки отключают рекурсию в %1. +</translation> + </message> + <message> + <source>lupdate warning: no TS files specified. Only diagnostics will be produced for '%1'. +</source> + <translation>Предупреждение lupdate: TS файлы не указаны. Будет произведена только диагностика "%1". +</translation> + </message> + <message> + <source>The option -target-language requires a parameter. +</source> + <translation>Параметр -target-language требует значение. +</translation> + </message> + <message> + <source>The option -source-language requires a parameter. +</source> + <translation>Параметр -source-language требует значение. +</translation> + </message> + <message> + <source>The option -disable-heuristic requires a parameter. +</source> + <translation>Параметр -disable-heuristic требует значение. +</translation> + </message> + <message> + <source>Invalid heuristic name passed to -disable-heuristic. +</source> + <translation>Неверное имя метода передано в -disable-heuristic. +</translation> + </message> + <message> + <source>The option -locations requires a parameter. +</source> + <translation>Параметр -locations требует значения.</translation> + </message> + <message> + <source>Invalid parameter passed to -locations. +</source> + <translation>Неверное значение передано в -locations. +</translation> + </message> + <message> + <source>The -codecfortr option should be followed by a codec name. +</source> + <translation>Параметру -codecfortr требуется название кодировки. +</translation> + </message> + <message> + <source>The -extensions option should be followed by an extension list. +</source> + <translation>Параметру -extensions требуется список расширений. +</translation> + </message> + <message> + <source>The -pro option should be followed by a filename of .pro file. +</source> + <translation>Параметру -pro требуется имя .pro файла. +</translation> + </message> + <message> + <source>The -I option should be followed by a path. +</source> + <translation>Параметру -I требуется путь. +</translation> + </message> + <message> + <source>Unrecognized option '%1'. +</source> + <translation>Неопознанный параметр "%1". +</translation> + </message> + <message> + <source>lupdate error: List file '%1' is not readable. +</source> + <translation>Ошибка lupdate: Не удалось прочитать файл списка "%1". +</translation> + </message> + <message> + <source>lupdate warning: For some reason, '%1' is not writable. +</source> + <translation>Предупреждение lupdate: По какой-то причине не удалось записать в "%1". +</translation> + </message> + <message> + <source>lupdate error: File '%1' has no recognized extension. +</source> + <translation>Ошибка lupdate: Расширение файла "%1" не опознано. +</translation> + </message> + <message> + <source>lupdate error: File '%1' does not exist. +</source> + <translation>Ошибка lupdate: Файл "%1" не существует. +</translation> + </message> + <message> + <source>Scanning directory '%1'... +</source> + <translation>Сканирование каталога "%1"... +</translation> + </message> + <message> + <source>lupdate warning: -target-language usually only makes sense with exactly one TS file. +</source> + <translation>Предупреждение lupdate: -target-language имеет смысл для одного TS файла. +</translation> + </message> + <message> + <source>lupdate warning: -codecfortr has no effect without -ts. +</source> + <translation>Предупреждение lupdate: -codecfortr не имеет смысла без -ts. +</translation> + </message> + <message> + <source>lupdate warning: no TS files specified. Only diagnostics will be produced. +</source> + <translation>Предупреждение lupdate: TS файлы не указаны. Будет произведена только диагностика. +</translation> + </message> + <message> + <source>lupdate error: Both project and source files / include paths specified. +</source> + <translation>Ошибка lupdate: Указаны и проект, и исходный файл / включаемые пути. +</translation> + </message> + <message numerus="yes"> + <source> Found %n source text(s) (%1 new and %2 already existing) +</source> + <translation> + <numerusform> Обнаружен %n исходный текст (%1 новых и %2 уже имеющихся) +</numerusform> + <numerusform> Обнаружено %n исходных текста (%1 новых и %2 уже имеющихся) +</numerusform> + <numerusform> Обнаружено %n исходных текстов (%1 новых и %2 уже имеющихся) +</numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Removed %n obsolete entries +</source> + <translation> + <numerusform>Удалена %n устаревшая запись +</numerusform> + <numerusform>Удалены %n устаревших записи +</numerusform> + <numerusform>Удалено %n устаревших записей +</numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Kept %n obsolete entries +</source> + <translation> + <numerusform>Сохранена %n устаревшая запись +</numerusform> + <numerusform>Сохранены %n устаревшие записи +</numerusform> + <numerusform>Сохранено %n устаревших записей +</numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Number heuristic provided %n translation(s) +</source> + <translation> + <numerusform> Эвристика number добавила %n перевод +</numerusform> + <numerusform> Эвристика number добавила %n перевода +</numerusform> + <numerusform> Эвристика number добавила %n переводов +</numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Same-text heuristic provided %n translation(s) +</source> + <translation> + <numerusform> Эвристика same-text добавила %n перевод +</numerusform> + <numerusform> Эвристика same-text добавила %n перевода +</numerusform> + <numerusform> Эвристика same-text добавила %n переводов +</numerusform> + </translation> + </message> + <message numerus="yes"> + <source> Similar-text heuristic provided %n translation(s) +</source> + <translation> + <numerusform> Эвристика similar-text добавила %n перевод +</numerusform> + <numerusform> Эвристика similar-text добавила %n перевода +</numerusform> + <numerusform> Эвристика similar-text добавила %n переводов +</numerusform> + </translation> + </message> + <message> + <source>Illegal character</source> + <translation>Недопустимый символ</translation> + </message> + <message> + <source>Unclosed string at end of line</source> + <translation>Незавершенный текст в конце строки</translation> + </message> + <message> + <source>Illegal escape squence</source> + <translation>Неверная esc-последовательность</translation> + </message> + <message> + <source>Illegal unicode escape sequence</source> + <translation>Неверная esc-последовательность unicode</translation> + </message> + <message> + <source>Unclosed comment at end of file</source> + <translation>Незакрытый комментарий в конце файла</translation> + </message> + <message> + <source>Illegal syntax for exponential number</source> + <translation>Неверный синтаксис для числа в экспоненциальной форме</translation> + </message> + <message> + <source>Identifier cannot start with numeric literal</source> + <translation>Идентификатор не может начинаться с цифры</translation> + </message> + <message> + <source>Unterminated regular expression literal</source> + <translation>Незавершённый литерал регулярного выражения</translation> + </message> + <message> + <source>//% cannot be used with %1(). Ignoring +</source> + <translation>//% не может быть использовано совместно с %1(). Пропускается +</translation> + </message> + <message> + <source>%1() requires at least two arguments. +</source> + <translation>для %1() требуется как минимум два параметра. +</translation> + </message> + <message> + <source>%1(): both arguments must be literal strings. +</source> + <translation>%1(): оба параметра должны быть строковыми литералами. +</translation> + </message> + <message> + <source>%1() requires at least one argument. +</source> + <translation>для %1() требуется как минимум один параметр. +</translation> + </message> + <message> + <source>%1(): text to translate must be a literal string. +</source> + <translation>%1(): переводимый текст должен быть строковым литералом. +</translation> + </message> + <message> + <source>//= cannot be used with %1(). Ignoring +</source> + <translation>//= не может быть использовано совместно с %1(). Пропускается +</translation> + </message> + <message> + <source>%1(): identifier must be a literal string. +</source> + <translation>%1(): идентификатор должен быть строковым литералом. +</translation> + </message> + <message> + <source>Expected </source> + <extracomment>Beginning of the string that contains comma-separated list of expected tokens</extracomment> + <translation>Ожидается </translation> + </message> + <message> + <source>XML error: Parse error at line %1, column %2 (%3).</source> + <translation>Ошибка XML: Ошибка разбора в строке %1, столбце %2 (%3).</translation> + </message> + <message> + <source>Parse error in UI file</source> + <translation>Ошибка разбора UI файла</translation> + </message> </context> <context> <name>MainWindow</name> @@ -1289,6 +2231,13 @@ Line: %2</source> </message> </context> <context> + <name>PhraseBook</name> + <message> + <source>Parse error at line %1, column %2 (%3).</source> + <translation>Ошибка разбора в строке %1, столбце %2 (%3).</translation> + </message> +</context> +<context> <name>PhraseBookBox</name> <message> <source></source> @@ -1460,6 +2409,12 @@ Line: %2</source> <source>XLIFF localization files</source> <translation>Файлы локализации XLIFF</translation> </message> + <message> + <source>lupdate version %1 +</source> + <translation>lupdate версия %1 +</translation> + </message> </context> <context> <name>SourceCodeView</name> diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 5fbd6e3..b445c5d 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -302,6 +302,14 @@ have libgstreamer-plugins-base installed.</source> <translation>Ошибка открытия адреса URL</translation> </message> <message> + <source>Error opening resource</source> + <translation>Ошибка открытия ресурса</translation> + </message> + <message> + <source>Error opening source: resource not opened</source> + <translation>Ошибка открытия источника: ресурс не был открыт</translation> + </message> + <message> <source>Setting volume failed</source> <translation>Не удалось установить уровень громкости</translation> </message> @@ -313,6 +321,10 @@ have libgstreamer-plugins-base installed.</source> <source>Playback complete</source> <translation>Воспроизведение завершено</translation> </message> + <message> + <source>Download error</source> + <translation>Ошибка загрузки</translation> + </message> </context> <context> <name>Phonon::MMF::AbstractVideoPlayer</name> @@ -421,6 +433,14 @@ have libgstreamer-plugins-base installed.</source> <translation>Ошибка открытия источника: тип не поддерживается</translation> </message> <message> + <source>Error opening source: resource is compressed</source> + <translation>Ошибка открытия источника: сжатый ресурс</translation> + </message> + <message> + <source>Error opening source: resource not valid</source> + <translation>Ошибка открытия источника: некорректный ресурс</translation> + </message> + <message> <source>Error opening source: media type could not be determined</source> <translation>Ошибка открытия источника: не удалось определить тип медиа-данных</translation> </message> @@ -1360,7 +1380,7 @@ to <name>QDeclarativeBinding</name> <message> <source>Binding loop detected for property "%1"</source> - <translation type="unfinished">Обнаружена цикличная привязка для свойства "%1"</translation> + <translation type="unfinished">Обнаружено зацикливание привязки для свойства "%1"</translation> </message> </context> <context> @@ -1574,6 +1594,10 @@ to <translation type="unfinished">Некорректное присваивание свойства: ожидается сценарий</translation> </message> <message> + <source>Cannot assign multiple values to a singular property</source> + <translation type="unfinished">Невозможно присвоить множество значений свойству, принимающему только одно</translation> + </message> + <message> <source>Cannot assign object to property</source> <translation type="unfinished">Невозможно назначить объектсвойству</translation> </message> @@ -1666,8 +1690,16 @@ to <translation type="unfinished">Некорректное размещение псевдонима</translation> </message> <message> + <source>Invalid alias reference. An alias reference must be specified as <id>, <id>.<property> or <id>.<value property>.<property></source> + <translation type="unfinished">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как <id>, <id>.<свойство> или <id>.<свойство значения>.<свойство></translation> + </message> + <message> + <source>Alias property exceeds alias bounds</source> + <translation type="unfinished">Свойство псевдонима выходит за границы</translation> + </message> + <message> <source>Invalid alias reference. An alias reference must be specified as <id> or <id>.<property></source> - <translation type="unfinished">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как <id> или <id>.<property></translation> + <translation type="obsolete">Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как <id> или <id>.<property></translation> </message> <message> <source>Invalid alias reference. Unable to find id "%1"</source> @@ -1682,29 +1714,10 @@ to </message> </context> <context> - <name>QDeclarativeCompositeTypeManager</name> - <message> - <source>Resource %1 unavailable</source> - <translation>Ресурс "%1" недоступен</translation> - </message> - <message> - <source>Namespace %1 cannot be used as a type</source> - <translation>Пространство имён "%1" не может быть использовано в качестве типа</translation> - </message> - <message> - <source>%1 %2</source> - <translation>%1 %2</translation> - </message> - <message> - <source>Type %1 unavailable</source> - <translation>Тип "%1" недоступен</translation> - </message> -</context> -<context> <name>QDeclarativeConnections</name> <message> <source>Cannot assign to non-existent property "%1"</source> - <translation type="unfinished">Невозможно назначить несуществующему свойству "%1"</translation> + <translation>Невозможно назначить несуществующему свойству "%1"</translation> </message> <message> <source>Connections: nested objects not allowed</source> @@ -1760,6 +1773,10 @@ to <context> <name>QDeclarativeImportDatabase</name> <message> + <source>cannot load module "%1": File name case mismatch for "%2"</source> + <translation type="unfinished">невозможно загрузить модуль "%1": Регистр имени файла не соответствует "%2"</translation> + </message> + <message> <source>module "%1" definition "%2" not readable</source> <translation type="unfinished">невозможно прочитать определение "%2" модуля "%1"</translation> </message> @@ -1815,6 +1832,10 @@ to <source>is not a type</source> <translation>не является типом</translation> </message> + <message> + <source>File name case mismatch for "%2"</source> + <translation type="unfinished">Регистр имени файла не соответствует "%2"</translation> + </message> </context> <context> <name>QDeclarativeKeyNavigationAttached</name> @@ -1918,7 +1939,7 @@ to <name>QDeclarativeParser</name> <message> <source>Illegal unicode escape sequence</source> - <translation type="unfinished">Неверная unicode esc-последовательность</translation> + <translation>Недопустимая unicode esc-последовательность</translation> </message> <message> <source>Illegal character</source> @@ -1930,7 +1951,7 @@ to </message> <message> <source>Illegal escape squence</source> - <translation type="unfinished">Неверная esc-последовательность</translation> + <translation>Недопустимая esc-последовательность</translation> </message> <message> <source>Unclosed comment at end of file</source> @@ -1938,7 +1959,7 @@ to </message> <message> <source>Illegal syntax for exponential number</source> - <translation type="unfinished">Недопустимый синтаксис для экспоненциального числа</translation> + <translation>Недопустимый синтаксис для экспоненциального числа</translation> </message> <message> <source>Identifier cannot start with numeric literal</source> @@ -1986,15 +2007,15 @@ to </message> <message> <source>Reserved name "Qt" cannot be used as an qualifier</source> - <translation type="unfinished">Зарезервированное имя "Qt" не может быть использовано в качестве спецификатора</translation> + <translation>Зарезервированное имя "Qt" не может быть использовано в качестве спецификатора</translation> </message> <message> <source>Script import qualifiers must be unique.</source> - <translation type="unfinished">Спецификаторы импорта сценария должны быть уникальными.</translation> + <translation>Спецификаторы импорта сценария должны быть уникальными.</translation> </message> <message> <source>Script import requires a qualifier</source> - <translation type="unfinished">Для импорта сценария требуется спецификатор</translation> + <translation>Для импорта сценария требуется спецификатор</translation> </message> <message> <source>Library import requires a version</source> @@ -2081,6 +2102,25 @@ to </message> </context> <context> + <name>QDeclarativeTypeLoader</name> + <message> + <source>Script %1 unavailable</source> + <translation>Сценарий %1 недоступен</translation> + </message> + <message> + <source>Type %1 unavailable</source> + <translation>Тип "%1" недоступен</translation> + </message> + <message> + <source>Namespace %1 cannot be used as a type</source> + <translation>Пространство имён "%1" не может быть использовано в качестве типа</translation> + </message> + <message> + <source>%1 %2</source> + <translation>%1 %2</translation> + </message> +</context> +<context> <name>QDeclarativeVME</name> <message> <source>Unable to create object of type %1</source> @@ -3298,18 +3338,10 @@ Please verify the correct directory name was given.</source> <context> <name>QLibrary</name> <message> - <source>Could not mmap '%1': %2</source> - <translation>Не удалось выполнить mmap "%1": %2</translation> - </message> - <message> <source>Plugin verification data mismatch in '%1'</source> <translation>Проверочная информация для модуля "%1" не совпадает</translation> </message> <message> - <source>Could not unmap '%1': %2</source> - <translation>Не удалось выполнить unmap "%1": %2</translation> - </message> - <message> <source>The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]</source> <translation>Модуль "%1" использует несоместимую библиотеку Qt. (%2.%3.%4) [%5]</translation> </message> @@ -6071,7 +6103,7 @@ Please choose a different file name.</source> </message> <message> <source>Voice Dial</source> - <extracomment>Button to trigger voice dialling</extracomment> + <extracomment>Button to trigger voice dialing</extracomment> <translation type="unfinished">Голосовой вызов</translation> </message> <message> @@ -8381,11 +8413,11 @@ Please choose a different file name.</source> </message> <message> <source>W3C XML Schema identity constraint selector</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Переключатель ограничений типа шаблона W3C XML</translation> </message> <message> <source>W3C XML Schema identity constraint field</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Поле ограничений типа шаблона W3C XML</translation> </message> <message> <source>A construct was encountered which is disallowed in the current language(%1).</source> @@ -9557,15 +9589,15 @@ Please choose a different file name.</source> </message> <message> <source>Data of type %1 are not allowed to be empty.</source> - <translation type="unfinished"></translation> + <translation>Данные типа %1 не могут быть пустыми.</translation> </message> <message> <source>Element %1 is missing child element.</source> - <translation type="unfinished"></translation> + <translation>У элемента %1 отсутствует дочерний элемент.</translation> </message> <message> <source>There is one IDREF value with no corresponding ID: %1.</source> - <translation type="unfinished"></translation> + <translation>Присутствует одно значение IDREF без соответствующего ID: %1.</translation> </message> <message> <source>Loaded schema file is invalid.</source> @@ -9593,7 +9625,7 @@ Please choose a different file name.</source> </message> <message> <source>Specified type %1 is not known to the schema.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Указанный тип %1 шаблону не известен.</translation> </message> <message> <source>Element %1 is not defined in this scope.</source> @@ -9601,15 +9633,15 @@ Please choose a different file name.</source> </message> <message> <source>Declaration for element %1 does not exist.</source> - <translation type="unfinished"></translation> + <translation>Отсутствует объявление элемента %1.</translation> </message> <message> <source>Element %1 contains invalid content.</source> - <translation type="unfinished"></translation> + <translation>В элементе %1 находится неверное содержимое.</translation> </message> <message> <source>Element %1 is declared as abstract.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 объявлен абстрактным.</translation> </message> <message> <source>Element %1 is not nillable.</source> @@ -9617,7 +9649,7 @@ Please choose a different file name.</source> </message> <message> <source>Attribute %1 contains invalid data: %2</source> - <translation type="unfinished"></translation> + <translation>Атрибут %1 содержит неверные данные: %2</translation> </message> <message> <source>Element contains content although it is nillable.</source> @@ -9625,7 +9657,7 @@ Please choose a different file name.</source> </message> <message> <source>Fixed value constraint not allowed if element is nillable.</source> - <translation type="unfinished"></translation> + <translation>Для обнуляемых элементов недопустимо ограничение фиксированным значением.</translation> </message> <message> <source>Element %1 cannot contain other elements, as it has a fixed content.</source> @@ -9633,75 +9665,75 @@ Please choose a different file name.</source> </message> <message> <source>Specified type %1 is not validly substitutable with element type %2.</source> - <translation type="unfinished"></translation> + <translation>Указанный тип %1 не может быть корректно замещён элементом типа %2.</translation> </message> <message> <source>Complex type %1 is not allowed to be abstract.</source> - <translation type="unfinished"></translation> + <translation>Недопустимо, чтобы сложный тип %1 был абстрактным.</translation> </message> <message> <source>Element %1 contains not allowed attributes.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 содержит недопустимые атрибуты.</translation> </message> <message> <source>Element %1 contains not allowed child element.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 содержит недопустимый дочерний элемент.</translation> </message> <message> <source>Content of element %1 does not match its type definition: %2.</source> - <translation type="unfinished"></translation> + <translation>Содержимое элемента %1 не соответствует его определению типа: %2.</translation> </message> <message> <source>Content of element %1 does not match defined value constraint.</source> - <translation type="unfinished"></translation> + <translation>Содержимое элемента %1 не соответствует определённому ограничению значения.</translation> </message> <message> <source>Element %1 contains not allowed child content.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Элемент %1 содержит недопустимое дочернее содержимое.</translation> </message> <message> <source>Element %1 contains not allowed text content.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 содержит недопустимое текстовое содержимое.</translation> </message> <message> <source>Element %1 is missing required attribute %2.</source> - <translation type="unfinished"></translation> + <translation>У элемента %1 отсутствует необходимый атрибут %2.</translation> </message> <message> <source>Attribute %1 does not match the attribute wildcard.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Атрибут %1 не соответствует шаблону.</translation> </message> <message> <source>Declaration for attribute %1 does not exist.</source> - <translation type="unfinished"></translation> + <translation>Отсутствует объявление атрибута %1.</translation> </message> <message> <source>Element %1 contains two attributes of type %2.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 содержит два атрибута типа %2.</translation> </message> <message> <source>Attribute %1 contains invalid content.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 содержит неверное содержимое.</translation> </message> <message> <source>Element %1 contains unknown attribute %2.</source> - <translation type="unfinished"></translation> + <translation>Элемент %1 содержит неизвестный атрибут %2.</translation> </message> <message> <source>Content of attribute %1 does not match its type definition: %2.</source> - <translation type="unfinished"></translation> + <translation>Содержимое атрибута %1 не соответствует его определению типа: %2.</translation> </message> <message> <source>Content of attribute %1 does not match defined value constraint.</source> - <translation type="unfinished"></translation> + <translation>Содержимое атрибута %1 не соответствует определённому ограничению значения.</translation> </message> <message> <source>Non-unique value found for constraint %1.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Обнаружено неуникальное значение для ограничения %1.</translation> </message> <message> <source>Key constraint %1 contains absent fields.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Ограничение на ключ %1 содержит недостающие поля.</translation> </message> <message> <source>Key constraint %1 contains references nillable element %2.</source> @@ -9717,7 +9749,7 @@ Please choose a different file name.</source> </message> <message> <source>Field %1 has no simple type.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Поле %1 имеет не простой тип.</translation> </message> <message> <source>ID value '%1' is not unique.</source> diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts index 7137d21..ea1671f 100644 --- a/translations/qtconfig_ru.ts +++ b/translations/qtconfig_ru.ts @@ -4,6 +4,26 @@ <context> <name>MainWindow</name> <message> + <source><p><b><font size+=2>Appearance</font></b></p><hr><p>Use this tab to customize the appearance of your Qt applications.</p><p>You can select the default GUI Style from the drop down list and customize the colors.</p><p>Any GUI Style plugins in your plugin path will automatically be added to the list of built-in Qt styles. (See the Library Paths tab for information on adding new plugin paths.)</p><p>When you choose 3-D Effects and Window Background colors, the Qt Configuration program will automatically generate a palette for you. To customize colors further, press the Tune Palette button to open the advanced palette editor.<p>The Preview Window shows what the selected Style and colors look like.</source> + <translation type="unfinished"><p><b><font size+=2>Внешний вид</font></b></p><hr><p>На этой вкладке можно настроить внешний вид приложений Qt.</p><p>Позволяет выбрать стиль интерфейса по умолчанию из выпадающего списка и настроить используемые стилем цвета.</p><p>Каждый стиль интерфейса, содержащийся в модулях, найденных в путях к модулям, автоматически добавляется в список встроенных стилей Qt (на вкладке Пути к библиотекам имеется более подробная информация о добавлении путей к модулям).</p><p>При выборе эффектов 3D и фоновых цветов окна программа настройки Qt автоматически создаст подходящую палитру. Для дальнейшей настройки цветов следует зайти в расширенный редактор палитры, нажав кнопку Настроить палитру.<p>В окне предпросмотра можно увидеть как будет выглядеть интерфейс с выбранными стилем и цветами.</translation> + </message> + <message> + <source><p><b><font size+=2>Fonts</font></b></p><hr><p>Use this tab to select the default font for your Qt applications. The selected font is shown (initially as 'Sample Text') in the line edit below the Family, Style and Point Size drop down lists.</p><p>Qt has a powerful font substitution feature that allows you to specify a list of substitute fonts. Substitute fonts are used when a font cannot be loaded, or if the specified font doesn't have a particular character.<p>For example, if you select the font Lucida, which doesn't have Korean characters, but need to show some Korean text using the Mincho font family you can do so by adding Mincho to the list. Once Mincho is added, any Korean characters that are not found in the Lucida font will be taken from the Mincho font. Because the font substitutions are lists, you can also select multiple families, such as Song Ti (for use with Chinese text).</source> + <translation type="unfinished"><p><b><font size+=2>Шрифты</font></b></p><hr><p>На этой вкладке можно выбрать шрифт по умолчанию для приложений Qt. Выбранный шрифт отображается в строке редактирования ниже выпадающих списков "Шрифт", "Начертание" и "Размер" (по умолчанию это текст "Текст для примера (Sample Text)").</p><p>Qt обладает мощным механизмом подмены шрифтов, который позволяет задавать список подставляемых шрифтов. Подставляемые шрифты используются, когда шрифт не удаётся загрузить или в нём отсутствуют необходимые символы.<p>Например, если требуется, чтобы при выборе шрифта Lucida, в котором отсутствуют корейские иероглифы, для отображения корейского текста использовался шрифт Mincho,то можно добавить его в список. После этого все корейские символы, отсутствующие в шрифте Lucida, будут браться из шрифта Mincho. Так как для замены используется список, то можно добавлять несколько шрифтов, например, можно также добавить шрифт Song Ti для отображения китайского текста.</translation> + </message> + <message> + <source><p><b><font size+=2>Interface</font></b></p><hr><p>Use this tab to customize the feel of your Qt applications.</p><p>If the Resolve Symlinks checkbox is checked Qt will follow symlinks when handling URLs. For example, in the file dialog, if this setting is turned on and /usr/tmp is a symlink to /var/tmp, entering the /usr/tmp directory will cause the file dialog to change to /var/tmp. With this setting turned off, symlinks are not resolved or followed.</p><p>The Global Strut setting is useful for people who require a minimum size for all widgets (e.g. when using a touch panel or for users who are visually impaired). Leaving the Global Strut width and height at 0 will disable the Global Strut feature</p><p>XIM (Extended Input Methods) are used for entering characters in languages that have large character sets, for example, Chinese and Japanese.</source> + <translation type="unfinished"><p><b><font size+=2>Интерфейс</font></b></p><hr><p>На этой вкладке можно настроить поведение приложений Qt.</p><p>Если включено "Разрешать символьные ссылки", Qt будет следовать по символьным ссылкам при обработке путей URL. Например, если эта функция включена и /usr/tmp является символьной ссылкой на /var/tmp, то в диалоге выбора файла при вводе пути к каталогу /usr/tmp он будет изменён на /var/tmp.</p><p>Функция "Минимальные размеры" предназначены для тех, кому необходимо чтобы элементы интерфейса были не менее заданного размера (например, при использовании сенсорной панели или для людей с проблемами зрения). Если задать 0 в полях "минимальная ширина" и "минимальная высота", то данная функция будет отключена.</p><p>Метод ввода XIM (расширенные методы ввода) используется для ввода символов на языках с большим набором символов (например, китайском или японском).</translation> + </message> + <message> + <source><p><b><font size+=2>Printer</font></b></p><hr><p>Use this tab to configure the way Qt generates output for the printer.You can specify if Qt should try to embed fonts into its generated output.If you enable font embedding, the resulting postscript will be more portable and will more accurately reflect the visual output on the screen; however the resulting postscript file size will be bigger.<p>When using font embedding you can select additional directories where Qt should search for embeddable font files. By default, the X server font path is used.</source> + <translation type="unfinished"><p><b><font size+=2>Принтер</font></b></p><hr><p>На этой вкладке можно настроить способ, которым Qt будет подготавливать данные для печати. Можно указать следует ли встраивать шрифты - в этом случае напечатанные документы будут более похожи на те, что на экране, но при этом увеличится объём данных, передаваемых на печатающее устройство.<p>При использовании встраивания шрифтов можно указать дополнительные каталоги, в которых Qt будет искать файлы шрифтов для встраивания. По умолчанию используется путь к шрифтам X сервера.</translation> + </message> + <message> + <source><p><b><font size+=2>Phonon</font></b></p><hr><p>Use this tab to configure the Phonon GStreamer multimedia backend. <p>It is reccommended to leave all settings on "Auto" to let Phonon determine your settings automatically.</source> + <translation type="unfinished"><p><b><font size+=2>Phonon</font></b></p><hr><p>На этой вкладке можно настроить мультимедийную подсистему Phonon GStreamer.<p>Рекомендуется оставить значение "Автоматически" для всех настроек, чтобы Phonon определил параметры самостоятельно.</translation> + </message> + <message> <source>Desktop Settings (Default)</source> <translation>Настройки рабочего стола (по умолчанию)</translation> </message> @@ -236,7 +256,7 @@ </message> <message> <source>Feel Settings</source> - <translation type="unfinished">Настройка указателя</translation> + <translation type="unfinished">Настройки поведения</translation> </message> <message> <source> ms</source> @@ -260,7 +280,7 @@ </message> <message> <source>Wheel &Scroll Lines:</source> - <translation type="unfinished">&Прокручивать строк при повороте колёсика:</translation> + <translation>&Прокручивать строк при повороте колёсика:</translation> </message> <message> <source>Resolve symlinks in URLs</source> @@ -268,7 +288,7 @@ </message> <message> <source>GUI Effects</source> - <translation type="unfinished">Эффекты пользовательского интерфейса</translation> + <translation>Эффекты интерфейса</translation> </message> <message> <source>&Enable</source> @@ -284,15 +304,15 @@ </message> <message> <source>C&omboBox Effect:</source> - <translation type="unfinished">Эффект &выпадающего списка:</translation> + <translation>Эффект &выпадающего списка:</translation> </message> <message> <source>&ToolTip Effect:</source> - <translation type="unfinished">Эффект &подсказки:</translation> + <translation>Эффект &подсказки:</translation> </message> <message> <source>Tool&Box Effect:</source> - <translation type="unfinished">Эффект панели &инструментов:</translation> + <translation>Эффект панели &инструментов:</translation> </message> <message> <source>Disable</source> @@ -308,7 +328,7 @@ </message> <message> <source>Global Strut</source> - <translation type="unfinished">Минимальные размеры</translation> + <translation>Минимальные размеры</translation> </message> <message> <source>Minimum &Width:</source> @@ -519,59 +539,59 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Build inactive palette from active</source> - <translation type="unfinished">Создать неактивную палитру из активной</translation> + <translation>Создать неактивную палитру из активной</translation> </message> <message> <source>Build disabled palette from active</source> - <translation type="unfinished">Создать выключенную палитру из активной</translation> + <translation>Создать выключенную палитру из активной</translation> </message> <message> <source>Central color &roles</source> - <translation type="unfinished">Роли &цветов</translation> + <translation>Основные роли &цветов</translation> </message> <message> <source>Choose central color role</source> - <translation type="unfinished">Выберите роль цвета</translation> + <translation>Выберите основную роль цвета</translation> </message> <message> <source><b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p></source> - <translation type="unfinished"><b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul><li>Window - основной цвет фона.</li> <li>WindowText - основной цвет текста.</li> <li>Base - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.</li> <li>Text - цвет текста используемый совместно с Base. Обычно, он совпадает с WindowText, так как в этом случае получается максимальный контраст и с Window, и с Base.</li> <li>Button - основной цвет фона кнопки, которой требуется цвет отличный от Window, например, в стиле Macintosh.</li> <li>ButtonText - цвет текста используемый совместно с Button.</li> <li>Highlight - цвет для обозначения выбранного или выделенного элемента.</li> <li>HighlightedText - цвет текста контрастирующий с Highlight.</li> <li>BrightText - цвет текста, который отличается от WindowText и хорошо контрастирует с черным.</li></ul></p></translation> + <translation><b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul><li><b>Окно</b> - основной цвет фона.</li> <li><b>Текст окна</b> - основной цвет текста.</li> <li><b>Фон</b> - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.</li> <li><b>Текст</b> - цвет текста используемый совместно с <b>Фон</b>. Обычно, он совпадает с <b>Текст окна</b>, так как в этом случае получается максимальный контраст и с <b>Окно</b>, и с <b>Фон</b>.</li> <li><b>Кнопка</b> - основной цвет фона кнопки, которой требуется цвет отличный от <b>Окно</b>, например, в стиле Macintosh.</li> <li><b>Текст кнопки</b> - цвет текста используемый совместно с <b>Кнопка</b>.</li> <li><b>Выделение</b> - цвет для обозначения выбранного или выделенного элемента.</li> <li><b>Выделенный текст</b> - цвет текста контрастирующий с <b>Выделение</b>.</li> <li><b>Яркий текст</b> - цвет текста, который отличается от <b>Текст окна</b> и хорошо контрастирует с черным.</li></ul></p></translation> </message> <message> <source>Window</source> - <translation type="unfinished"></translation> + <translation>Окно</translation> </message> <message> <source>WindowText</source> - <translation type="unfinished"></translation> + <translation>Текст окна</translation> </message> <message> <source>Button</source> - <translation type="unfinished"></translation> + <translation>Кнопка</translation> </message> <message> <source>Base</source> - <translation type="unfinished"></translation> + <translation>Фон</translation> </message> <message> <source>Text</source> - <translation type="unfinished"></translation> + <translation>Текст</translation> </message> <message> <source>BrightText</source> - <translation type="unfinished"></translation> + <translation>Светлый текст</translation> </message> <message> <source>ButtonText</source> - <translation type="unfinished"></translation> + <translation>Текст на кнопке</translation> </message> <message> <source>Highlight</source> - <translation type="unfinished"></translation> + <translation>Выделение</translation> </message> <message> <source>HighlightedText</source> - <translation type="unfinished"></translation> + <translation>Выделенный текст</translation> </message> <message> <source>&Select Color:</source> @@ -595,39 +615,39 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Generate shadings</source> - <translation type="unfinished">Создание полутонов</translation> + <translation>Создание полутонов</translation> </message> <message> <source>Check to let 3D-effect colors be calculated from button-color.</source> - <translation type="unfinished">Включите, чтобы цвета эффекта трёхмерности были получены из цвета кнопки.</translation> + <translation>Создать цвета эффекта трёхмерности из цвета кнопки.</translation> </message> <message> <source>Choose 3D-effect color role</source> - <translation type="unfinished">Выбор роли цвета дял эффекта трёхмерности</translation> + <translation>Выбор роли цвета дял эффекта трёхмерности</translation> </message> <message> <source><b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul></source> - <translation><b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul> <li>Light - светлее цвета Button. </li> <li>Midlight - среднее между Light и Button. </li> <li>Mid - среднее между Button и Dark. </li> <li>Dark - темнее цвета Button. </li> <li>Shadow - очень темный цвет. </li> </ul></translation> + <translation><b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul> <li><b>Светлый</b> - светлее цвета <b>Кнопка</b>. </li> <li><b>Полусветлый</b> - среднее между <b>Светлый</b> и <b>Кнопка</b>. </li> <li><b>Полутёмный</b> - среднее между <b>Кнопка</b> и <b>Тёмный</b>. </li> <li><b>Тёмный</b> - темнее цвета <b>Кнопка</b>. </li> <li><b>Тень</b> - очень темный цвет. </li> </ul></translation> </message> <message> <source>Light</source> - <translation type="unfinished"></translation> + <translation>Светлый</translation> </message> <message> <source>Midlight</source> - <translation type="unfinished"></translation> + <translation>Полусветлый</translation> </message> <message> <source>Mid</source> - <translation type="unfinished"></translation> + <translation>Полутёмный</translation> </message> <message> <source>Dark</source> - <translation type="unfinished"></translation> + <translation>Тёмный</translation> </message> <message> <source>Shadow</source> - <translation type="unfinished"></translation> + <translation>Тень</translation> </message> <message> <source>Select Co&lor:</source> @@ -635,7 +655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Choose a color for the selected effect color role.</source> - <translation type="unfinished">Выбор цвета для указанной роли.</translation> + <translation>Выбор цвета для указанной роли.</translation> </message> <message> <source>OK</source> diff --git a/translations/qvfb_ru.ts b/translations/qvfb_ru.ts index a1988de..db9ff2a 100644 --- a/translations/qvfb_ru.ts +++ b/translations/qvfb_ru.ts @@ -262,6 +262,126 @@ <context> <name>QVFb</name> <message> + <source>&File</source> + <translation>&Файл</translation> + </message> + <message> + <source>&Configure...</source> + <translation>&Настройки...</translation> + </message> + <message> + <source>&Save image...</source> + <translation>&Сохранить изображение...</translation> + </message> + <message> + <source>&Animation...</source> + <translation>&Анимация...</translation> + </message> + <message> + <source>&Quit</source> + <translation>В&ыход</translation> + </message> + <message> + <source>&View</source> + <translation>&Вид</translation> + </message> + <message> + <source>Show &Cursor</source> + <translation>Отображать &курсор</translation> + </message> + <message> + <source>&Refresh Rate...</source> + <translation>&Частота обновлений...</translation> + </message> + <message> + <source>&No rotation</source> + <translation>&Без поворота</translation> + </message> + <message> + <source>&90° rotation</source> + <translation>Поворот на &90°</translation> + </message> + <message> + <source>1&80° rotation</source> + <translation>Поворот на 1&80°</translation> + </message> + <message> + <source>2&70° rotation</source> + <translation>Поворот на 2&70°</translation> + </message> + <message> + <source>Zoom scale &0.5</source> + <translation>Масштаб &0.5</translation> + </message> + <message> + <source>Zoom scale 0.7&5</source> + <translation>Масштаб 0.7&5</translation> + </message> + <message> + <source>Zoom scale &1</source> + <translation>Масштаб &1</translation> + </message> + <message> + <source>Zoom scale &2</source> + <translation>Масштаб &2</translation> + </message> + <message> + <source>Zoom scale &3</source> + <translation>Масштаб &3</translation> + </message> + <message> + <source>Zoom scale &4</source> + <translation>Масштаб &4</translation> + </message> + <message> + <source>Zoom &scale...</source> + <translation>&Масштаб...</translation> + </message> + <message> + <source>&Help</source> + <translation>&Справка</translation> + </message> + <message> + <source>&About...</source> + <translation>&О программе...</translation> + </message> + <message> + <source>Save Main Screen image</source> + <translation>Сохранить снимок основного экрана</translation> + </message> + <message> + <source>snapshot.png</source> + <translation>снимок.png</translation> + </message> + <message> + <source>Portable Network Graphics (*.png)</source> + <translation>Portable Network Graphics (*.png)</translation> + </message> + <message> + <source>Save Main Screen Image</source> + <translation>Сохранить снимок основного экрана</translation> + </message> + <message> + <source>Save failed. Check that you have permission to write to the target directory.</source> + <translation>Не удалось сохранить. Убедитесь, что Вы имеете права на запись в целевой каталог.</translation> + </message> + <message> + <source>Save Second Screen image</source> + <translation>Сохранить снимок дополнительного экрана</translation> + </message> + <message> + <source>Save Second Screen Image</source> + <translation>Сохранить снимок дополнительного экрана</translation> + </message> + <message> + <source>About QVFB</source> + <translation>О QVFB</translation> + </message> + <message> + <source><h2>The Qt for Embedded Linux Virtual X11 Framebuffer</h2><p>This application runs under Qt for X11, emulating a simple framebuffer, which the Qt for Embedded Linux server and clients can attach to just as if it was a hardware Linux framebuffer. <p>With the aid of this development tool, you can develop Qt for Embedded Linux applications under X11 without having to switch to a virtual console. This means you can comfortably use your other development tools such as GUI profilers and debuggers.</source> + <translation><h2>Qt для Embedded Linux Virtual X11 Framebuffer</h2><p>Данное приложение работает под Qt для X11, эмулируя простой фрэймбуфер, к которому сервер и клиенты Qt для Embedded Linux могут соединяться как если бы это был аппаратный фрэймбуфер Linux. <p>С помощью данного инструмента Вы можете разрабатывать приложения Qt для Embedded Linux под X11 без необходимости переключаться в виртуальную консоль, что делает более удобным использование других инструментов с графическим интерфейсом - как то профайлеров и отладчиков.</translation> + </message> + <message> <source>Browse...</source> <translation>Обзор...</translation> </message> @@ -274,4 +394,23 @@ <translation>Все обложки QVFB (*.skin)</translation> </message> </context> +<context> + <name>QVFbRateDialog</name> + <message> + <source>Target frame rate:</source> + <translation>Частота смены кадров:</translation> + </message> + <message> + <source>%1fps</source> + <translation>%1 к/с</translation> + </message> + <message> + <source>OK</source> + <translation>ОК</translation> + </message> + <message> + <source>Cancel</source> + <translation>Отмена</translation> + </message> +</context> </TS> |