Changeset 1156 for branches/vendor/nokia/qt/current/tools/qml/qdeclarativetester.cpp

Timestamp:

Nov 7, 2014, 5:23:02 PM (11 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Import qt-everywhere-opensource-src-4.8.6 from Digia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

File:

• branches/vendor/nokia/qt/current/tools/qml/qdeclarativetester.cpp (modified) (9 diffs)

branches/vendor/nokia/qt/current/tools/qml/qdeclarativetester.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the tools applications of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
+** Commercial Usage
+** Licensees holding valid  licenses may use this file in
+** accordance with the greement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
@@ -22 +23 @@
 ** 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
+** In addition, as a special exception, ia gives you certain additional
+** rights.  These rights are described in the ia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
@@ -34 +35 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at [email protected].
+**
 ** $QT_END_LICENSE$
 **
@@ -49 +49 @@
 #include <QCryptographicHash>
 #include <private/qabstractanimation_p.h>
+
+
 #include <private/qdeclarativeitem_p.h>
+
 
 QT_BEGIN_NAMESPACE
@@ -203 +206 @@
     QFileInfo filenameInfo(filename);
     QDir saveDir = filenameInfo.absoluteDir();
-    saveDir.mkpath(".");
+    saveDir.mkpath();
 
     QFile file(filename);
@@ -222 +225 @@
             ts << "        hash: \"" << fe.hash.toHex() << "\"\n";
         } else if (!fe.image.isNull()) {
-            QString filename = filenameInfo.baseName() + "." + QString::number(imgCount) + ".png";
-            fe.image.save(m_script + "." + QString::number(imgCount) + ".png");
+            QString filename = filenameInfo.baseName() + ;
+            fe.image.save(m_script + );
             imgCount++;
             ts << "        image: \"" << filename << "\"\n";
@@ -267 +270 @@
 void QDeclarativeTester::updateCurrentTime(int msec)
 {
+
     QDeclarativeItemPrivate::setConsistentTime(msec);
+
     if (!testscript && msec > 16 && options & QDeclarativeViewer::Snapshot)
         return;
@@ -371 +376 @@
                 }
                 if (goodImage != img) {
-                    QString reject(frame->image().toLocalFile() + ".reject.png");
+                    QString reject(frame->image().toLocalFile() + );
                     qWarning() << "QDeclarativeTester(" << m_script << "): Image mismatch.  Reject saved to:"
                                << reject;
@@ -389 +394 @@
                             }
                         }
-                        QString diff(frame->image().toLocalFile() + ".diff.png");
+                        QString diff(frame->image().toLocalFile() + );
                         diffimg.save(diff);
                         qWarning().nospace() << "                    Diff (" << diffCount << " pixels differed) saved to: " << diff;