summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/activeqt/testcon/scripts/pythonscript.py42
-rw-r--r--tools/designer/src/designer/versiondialog.cpp2
-rw-r--r--tools/designer/src/uitools/uitools.pro1
-rw-r--r--tools/linguist/linguist/mainwindow.cpp2
-rw-r--r--tools/linguist/lrelease/lrelease.14
-rw-r--r--tools/porting/src/ast.cpp2
-rw-r--r--tools/porting/src/ast.h2
-rw-r--r--tools/porting/src/codemodel.cpp2
-rw-r--r--tools/porting/src/codemodel.h2
-rw-r--r--tools/porting/src/cpplexer.cpp2
-rw-r--r--tools/porting/src/cpplexer.h2
-rw-r--r--tools/porting/src/errors.cpp2
-rw-r--r--tools/porting/src/errors.h2
-rw-r--r--tools/porting/src/parser.cpp2
-rw-r--r--tools/porting/src/parser.h2
-rw-r--r--tools/porting/src/rpp.cpp2
-rw-r--r--tools/porting/src/rpp.h2
-rw-r--r--tools/porting/src/rpplexer.cpp2
-rw-r--r--tools/porting/src/rpplexer.h2
-rw-r--r--tools/porting/src/rpptreeevaluator.cpp2
-rw-r--r--tools/porting/src/semantic.cpp2
-rw-r--r--tools/porting/src/semantic.h2
-rw-r--r--tools/porting/src/smallobject.cpp2
-rw-r--r--tools/porting/src/smallobject.h2
-rw-r--r--tools/porting/src/tokenizer.cpp2
-rw-r--r--tools/porting/src/tokenizer.h2
-rw-r--r--tools/porting/src/tokens.h2
-rw-r--r--tools/porting/src/tokenstreamadapter.h2
-rw-r--r--tools/porting/src/treewalker.cpp2
-rw-r--r--tools/porting/src/treewalker.h2
-rw-r--r--tools/qttracereplay/main.cpp198
-rw-r--r--tools/qttracereplay/qttracereplay.pro13
-rw-r--r--tools/tools.pro3
-rw-r--r--tools/xmlpatternsvalidator/main.h20
34 files changed, 294 insertions, 41 deletions
diff --git a/tools/activeqt/testcon/scripts/pythonscript.py b/tools/activeqt/testcon/scripts/pythonscript.py
index 79bca87..d9cc67c 100644
--- a/tools/activeqt/testcon/scripts/pythonscript.py
+++ b/tools/activeqt/testcon/scripts/pythonscript.py
@@ -1,3 +1,45 @@
+#!/usr/bin/env python
+#############################################################################
+##
+## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## 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$
+##
+#############################################################################
+
def QAxWidget2_Click():
QAxWidget2.lineWidth = QAxWidget2.lineWidth + 1;
MainWindow.logMacro(0, "Hello from Python: QAxWidget2_Click", 0, "");
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp
index d503738..10430d8 100644
--- a/tools/designer/src/designer/versiondialog.cpp
+++ b/tools/designer/src/designer/versiondialog.cpp
@@ -174,7 +174,7 @@ VersionDialog::VersionDialog(QWidget *parent)
lbl->setText(tr("%1"
"<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
- ).arg(version).arg(edition));
+ ).arg(version));
lbl->setWordWrap(true);
lbl->setOpenExternalLinks(true);
diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro
index 34e4877..38b7add 100644
--- a/tools/designer/src/uitools/uitools.pro
+++ b/tools/designer/src/uitools/uitools.pro
@@ -39,3 +39,4 @@ unix {
QMAKE_PKGCONFIG_REQUIRES += QtXml
}
+symbian: TARGET.UID3 = 0x2001E628
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 22c1e11..71a932d 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -1352,7 +1352,7 @@ void MainWindow::about()
"<p>Qt Linguist is a tool for adding translations to Qt "
"applications.</p>"
"<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
- ).arg(version).arg(edition));
+ ).arg(version));
box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist"));
box.setIcon(QMessageBox::NoIcon);
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 8f1a3ff..5390afe 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -2,9 +2,9 @@
.\"
.\" Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
.\" Contact: Nokia Corporation (qt-info@nokia.com)
-.\"
+.\"
.\" This file is part of the QtGui module of the Qt Toolkit.
-.\"
+.\"
.\" $QT_BEGIN_LICENSE:LGPL$
.\" No Commercial Usage
.\" This file contains pre-release code and may not be distributed.
diff --git a/tools/porting/src/ast.cpp b/tools/porting/src/ast.cpp
index 118d52c..4a36e35 100644
--- a/tools/porting/src/ast.cpp
+++ b/tools/porting/src/ast.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/ast.h b/tools/porting/src/ast.h
index e71d2e0..85d7070 100644
--- a/tools/porting/src/ast.h
+++ b/tools/porting/src/ast.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/codemodel.cpp b/tools/porting/src/codemodel.cpp
index b9b82aa..be0682b 100644
--- a/tools/porting/src/codemodel.cpp
+++ b/tools/porting/src/codemodel.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h
index 62cb314..4807972 100644
--- a/tools/porting/src/codemodel.h
+++ b/tools/porting/src/codemodel.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/cpplexer.cpp b/tools/porting/src/cpplexer.cpp
index 4be00f6..79dcd9a 100644
--- a/tools/porting/src/cpplexer.cpp
+++ b/tools/porting/src/cpplexer.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/cpplexer.h b/tools/porting/src/cpplexer.h
index ed01b69..5c756c4 100644
--- a/tools/porting/src/cpplexer.h
+++ b/tools/porting/src/cpplexer.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/errors.cpp b/tools/porting/src/errors.cpp
index b8a3d8c..abd58e3 100644
--- a/tools/porting/src/errors.cpp
+++ b/tools/porting/src/errors.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/errors.h b/tools/porting/src/errors.h
index 46eeab7..e34e04d 100644
--- a/tools/porting/src/errors.h
+++ b/tools/porting/src/errors.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/parser.cpp b/tools/porting/src/parser.cpp
index 50325f8..83f0c4b 100644
--- a/tools/porting/src/parser.cpp
+++ b/tools/porting/src/parser.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/parser.h b/tools/porting/src/parser.h
index 1397886..330c9f5 100644
--- a/tools/porting/src/parser.h
+++ b/tools/porting/src/parser.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp
index 787ce2a..b6ec429 100644
--- a/tools/porting/src/rpp.cpp
+++ b/tools/porting/src/rpp.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/rpp.h b/tools/porting/src/rpp.h
index 2c10b51..863e2fc 100644
--- a/tools/porting/src/rpp.h
+++ b/tools/porting/src/rpp.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/rpplexer.cpp b/tools/porting/src/rpplexer.cpp
index e92ec9b..bbea068 100644
--- a/tools/porting/src/rpplexer.cpp
+++ b/tools/porting/src/rpplexer.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/rpplexer.h b/tools/porting/src/rpplexer.h
index 273df0c..e661fa0 100644
--- a/tools/porting/src/rpplexer.h
+++ b/tools/porting/src/rpplexer.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/rpptreeevaluator.cpp b/tools/porting/src/rpptreeevaluator.cpp
index 9d6e3db..d696f75 100644
--- a/tools/porting/src/rpptreeevaluator.cpp
+++ b/tools/porting/src/rpptreeevaluator.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp
index 296e614..efe2bc4 100644
--- a/tools/porting/src/semantic.cpp
+++ b/tools/porting/src/semantic.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/semantic.h b/tools/porting/src/semantic.h
index 8e16f2e..548faf6 100644
--- a/tools/porting/src/semantic.h
+++ b/tools/porting/src/semantic.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/smallobject.cpp b/tools/porting/src/smallobject.cpp
index eac82ef..c3b221f 100644
--- a/tools/porting/src/smallobject.cpp
+++ b/tools/porting/src/smallobject.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/smallobject.h b/tools/porting/src/smallobject.h
index adc4ae7..8b9f91f 100644
--- a/tools/porting/src/smallobject.h
+++ b/tools/porting/src/smallobject.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/tokenizer.cpp b/tools/porting/src/tokenizer.cpp
index 4cdf584..e971602 100644
--- a/tools/porting/src/tokenizer.cpp
+++ b/tools/porting/src/tokenizer.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/tokenizer.h b/tools/porting/src/tokenizer.h
index d98315a..1762c78 100644
--- a/tools/porting/src/tokenizer.h
+++ b/tools/porting/src/tokenizer.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/tokens.h b/tools/porting/src/tokens.h
index 960f1ce..02eab54 100644
--- a/tools/porting/src/tokens.h
+++ b/tools/porting/src/tokens.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/tokenstreamadapter.h b/tools/porting/src/tokenstreamadapter.h
index 110f814b..948db5a 100644
--- a/tools/porting/src/tokenstreamadapter.h
+++ b/tools/porting/src/tokenstreamadapter.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/treewalker.cpp b/tools/porting/src/treewalker.cpp
index 1593674..2d3d53c 100644
--- a/tools/porting/src/treewalker.cpp
+++ b/tools/porting/src/treewalker.cpp
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/porting/src/treewalker.h b/tools/porting/src/treewalker.h
index 3f75d7c..168d7b4 100644
--- a/tools/porting/src/treewalker.h
+++ b/tools/porting/src/treewalker.h
@@ -1,8 +1,8 @@
/****************************************************************************
**
+** Copyright (C) 2001-2004 Roberto Raggi
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
-** Copyright (C) 2001-2004 Roberto Raggi
**
** This file is part of the qt3to4 porting application of the Qt Toolkit.
**
diff --git a/tools/qttracereplay/main.cpp b/tools/qttracereplay/main.cpp
new file mode 100644
index 0000000..970531b
--- /dev/null
+++ b/tools/qttracereplay/main.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+#include <QtDebug>
+
+#include <private/qpaintengineex_p.h>
+#include <private/qpaintbuffer_p.h>
+
+struct Frame
+{
+ QRegion updateRegion;
+ QPaintBuffer *buffer;
+};
+
+class ReplayWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ ReplayWidget(const QString &filename);
+
+ void paintEvent(QPaintEvent *event);
+
+public slots:
+ void updateRect();
+
+private:
+ QList<Frame> frames;
+ int currentFrame;
+ int currentIteration;
+ QTime timer;
+
+ QList<uint> iterationTimes;
+ QString filename;
+};
+
+void ReplayWidget::updateRect()
+{
+ update(frames.at(currentFrame).updateRegion);
+}
+
+void ReplayWidget::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+
+// p.setClipRegion(frames.at(currentFrame).updateRegion);
+
+ frames.at(currentFrame).buffer->draw(&p);
+
+ ++currentFrame;
+ if (currentFrame >= frames.size()) {
+ currentFrame = 0;
+ ++currentIteration;
+
+ if (currentIteration == 3)
+ timer.start();
+ else if (currentIteration > 3) {
+ iterationTimes << timer.elapsed();
+ timer.restart();
+
+ if (iterationTimes.size() >= 3) {
+ qreal mean = 0;
+ qreal stddev = 0;
+ uint min = INT_MAX;
+
+ for (int i = 0; i < iterationTimes.size(); ++i) {
+ mean += iterationTimes.at(i);
+ min = qMin(min, iterationTimes.at(i));
+ }
+
+ mean /= qreal(iterationTimes.size());
+
+ for (int i = 0; i < iterationTimes.size(); ++i) {
+ qreal delta = iterationTimes.at(i) - mean;
+ stddev += delta * delta;
+ }
+
+ stddev = qSqrt(stddev / iterationTimes.size());
+
+ qSort(iterationTimes.begin(), iterationTimes.end());
+ qreal median = iterationTimes.at(iterationTimes.size() / 2);
+ if ((iterationTimes.size() % 1) == 1)
+ median = (median + iterationTimes.at(iterationTimes.size() / 2 - 1)) * 0.5;
+
+ stddev = 100 * stddev / mean;
+
+ if (iterationTimes.size() >= 10 || stddev < 4) {
+ printf("%s, iterations: %d, frames: %d, min(ms): %d, median(ms): %f, stddev: %f %%, max(fps): %f\n", qPrintable(filename),
+ iterationTimes.size(), frames.size(), min, median, stddev, 1000. * frames.size() / min);
+ deleteLater();
+ return;
+ }
+ }
+ }
+ }
+
+ QTimer::singleShot(0, this, SLOT(updateRect()));
+}
+
+ReplayWidget::ReplayWidget(const QString &filename_)
+ : currentFrame(0)
+ , currentIteration(0)
+ , filename(filename_)
+{
+ setWindowTitle(filename);
+ QFile file(filename);
+
+ QRect bounds;
+ if (file.open(QIODevice::ReadOnly)) {
+ QDataStream in(&file);
+
+ while (true) {
+ int frameId;
+ in >> frameId;
+
+ if (in.status() != QDataStream::Ok)
+ break;
+
+ qulonglong windowId;
+ QRegion rgn;
+
+ in >> windowId;
+
+ Frame frame;
+ frame.buffer = new QPaintBuffer;
+
+ in >> bounds;
+
+ in >> frame.updateRegion;
+ in >> *frame.buffer;
+
+ frames << frame;
+ }
+ }
+
+ qDebug() << "Read" << frames.size() << "frames";
+
+ resize(bounds.size());
+
+ setAutoFillBackground(false);
+ setAttribute(Qt::WA_NoSystemBackground);
+
+ QTimer::singleShot(10, this, SLOT(updateRect()));
+}
+
+int main(int argc, char **argv)
+{
+ QApplication app(argc, argv);
+
+ if (argc <= 1) {
+ printf("Usage: %s filename\n", argv[0]);
+ return 1;
+ }
+
+ ReplayWidget *widget = new ReplayWidget(argv[1]);
+ widget->show();
+
+ return app.exec();
+}
+#include "main.moc"
diff --git a/tools/qttracereplay/qttracereplay.pro b/tools/qttracereplay/qttracereplay.pro
new file mode 100644
index 0000000..766ed04
--- /dev/null
+++ b/tools/qttracereplay/qttracereplay.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+DESTDIR = ../../bin
+
+DEPENDPATH += .
+INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src
+TARGET = qttracereplay
+
+# Input
+SOURCES += main.cpp
+
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/tools/tools.pro b/tools/tools.pro
index a602892..4b36115 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -6,7 +6,8 @@ no-png {
SUBDIRS += assistant \
pixeltool \
porting \
- qtestlib
+ qtestlib \
+ qttracereplay
contains(QT_EDITION, Console) {
SUBDIRS += designer/src/uitools # Linguist depends on this
} else {
diff --git a/tools/xmlpatternsvalidator/main.h b/tools/xmlpatternsvalidator/main.h
index a884f11..9c7a2d6 100644
--- a/tools/xmlpatternsvalidator/main.h
+++ b/tools/xmlpatternsvalidator/main.h
@@ -1,10 +1,11 @@
/****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the Patternist project on Qt Labs. * **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Patternist project on Qt Labs.
+**
+** $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
@@ -35,11 +36,8 @@
**
**
** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
//
// W A R N I N G