OSDN Git Service

remove manual QGraphicsView benchmarks
authorIvailo Monev <xakepa10@laimg.moc>
Fri, 29 Nov 2019 09:24:42 +0000 (09:24 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Fri, 29 Nov 2019 09:24:42 +0000 (09:24 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
19 files changed:
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/fileprint.png [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/images.qrc [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/qt4logo.png [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateleft.png [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateright.png [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomin.png [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomout.png [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp [deleted file]
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro [deleted file]

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.cpp
deleted file mode 100644 (file)
index 98d4418..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "chip.h"
-
-#include <QtGui>
-
-Chip::Chip(const QColor &color, int x, int y)
-{
-    this->x = x;
-    this->y = y;
-    this->color = color;
-    setZValue((x + y) % 2);
-
-    setFlags(ItemIsSelectable | ItemIsMovable);
-    setAcceptHoverEvents(true);
-}
-
-QRectF Chip::boundingRect() const
-{
-    return QRectF(0, 0, 110, 70);
-}
-
-QPainterPath Chip::shape() const
-{
-    QPainterPath path;
-    path.addRect(14, 14, 82, 42);
-    return path;
-}
-
-void Chip::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    Q_UNUSED(widget);
-
-    QColor fillColor = (option->state & QStyle::State_Selected) ? color.dark(150) : color;
-    if (option->state & QStyle::State_MouseOver)
-        fillColor = fillColor.light(125);
-
-    if (option->levelOfDetail < 0.2) {
-        if (option->levelOfDetail < 0.125) {
-            painter->fillRect(QRectF(0, 0, 110, 70), fillColor);
-            return;
-        }
-
-        painter->setPen(QPen(Qt::black, 0));
-        painter->setBrush(fillColor);
-        painter->drawRect(13, 13, 97, 57);
-        return;
-    }
-
-    QPen oldPen = painter->pen();
-    QPen pen = oldPen;
-    int width = 0;
-    if (option->state & QStyle::State_Selected)
-        width += 2;
-
-    pen.setWidth(width);
-    painter->setBrush(QBrush(fillColor.dark(option->state & QStyle::State_Sunken ? 120 : 100)));
-
-    painter->drawRect(QRect(14, 14, 79, 39));
-    if (option->levelOfDetail >= 1) {
-        painter->setPen(QPen(Qt::gray, 1));
-        painter->drawLine(15, 54, 94, 54);
-        painter->drawLine(94, 53, 94, 15);
-        painter->setPen(QPen(Qt::black, 0));
-    }
-
-    // Draw text
-    if (option->levelOfDetail >= 2) {
-        QFont font("Times", 10);
-        font.setStyleStrategy(QFont::ForceOutline);
-        painter->setFont(font);
-        painter->save();
-        painter->scale(0.1, 0.1);
-        painter->drawText(170, 180, QString("Model: VSC-2000 (Very Small Chip) at %1x%2").arg(x).arg(y));
-        painter->drawText(170, 200, QLatin1String("Serial number: DLWR-WEER-123L-ZZ33-SDSJ"));
-        painter->drawText(170, 220, QLatin1String("Manufacturer: Chip Manufacturer"));
-        painter->restore();
-    }
-
-    // Draw lines
-    QVarLengthArray<QLineF, 36> lines;
-    if (option->levelOfDetail >= 0.5) {
-        for (int i = 0; i <= 10; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
-            lines.append(QLineF(18 + 7 * i, 13, 18 + 7 * i, 5));
-            lines.append(QLineF(18 + 7 * i, 54, 18 + 7 * i, 62));
-        }
-        for (int i = 0; i <= 6; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
-            lines.append(QLineF(5, 18 + i * 5, 13, 18 + i * 5));
-            lines.append(QLineF(94, 18 + i * 5, 102, 18 + i * 5));
-        }
-    }
-    if (option->levelOfDetail >= 0.4) {
-        const QLineF lineData[] = {
-            QLineF(25, 35, 35, 35),
-            QLineF(35, 30, 35, 40),
-            QLineF(35, 30, 45, 35),
-            QLineF(35, 40, 45, 35),
-            QLineF(45, 30, 45, 40),
-            QLineF(45, 35, 55, 35)
-        };
-        lines.append(lineData, 6);
-    }
-    painter->drawLines(lines.data(), lines.size());
-
-    // Draw red ink
-    if (stuff.size() > 1) {
-        painter->setPen(QPen(Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-        painter->setBrush(Qt::NoBrush);
-        QPainterPath path;
-        path.moveTo(stuff.first());
-        for (int i = 1; i < stuff.size(); ++i)
-            path.lineTo(stuff.at(i));
-        painter->drawPath(path);
-    }
-}
-
-void Chip::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    QGraphicsItem::mousePressEvent(event);
-    update();
-}
-
-void Chip::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (event->modifiers() & Qt::ShiftModifier) {
-        stuff << event->pos();
-        update();
-        return;
-    }
-    QGraphicsItem::mouseMoveEvent(event);
-}
-
-void Chip::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    QGraphicsItem::mouseReleaseEvent(event);
-    update();
-}
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.h
deleted file mode 100644 (file)
index ef2b467..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CHIP_H
-#define CHIP_H
-
-#include <QtGui/QColor>
-#include <QtGui/QGraphicsItem>
-
-class Chip : public QGraphicsItem
-{
-public:
-    Chip(const QColor &color, int x, int y);
-
-    QRectF boundingRect() const;
-    QPainterPath shape() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
-
-protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-
-private:
-    int x, y;
-    QColor color;
-    QList<QPointF> stuff;
-};
-
-#endif
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
deleted file mode 100644 (file)
index 53fa23b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-RESOURCES += images.qrc
-
-HEADERS += mainwindow.h view.h chip.h
-SOURCES += main.cpp
-SOURCES += mainwindow.cpp view.cpp chip.cpp
-
-contains(QT_CONFIG, opengl):QT += opengl
-
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
-# install
-target.path = $$[QT_INSTALL_DEMOS]/chip
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/chip
-INSTALLS += target sources
-
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/fileprint.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/fileprint.png
deleted file mode 100644 (file)
index ba7c02d..0000000
Binary files a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/fileprint.png and /dev/null differ
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/images.qrc b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/images.qrc
deleted file mode 100644 (file)
index c7cdf0c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>qt4logo.png</file>
-    <file>zoomin.png</file>
-    <file>zoomout.png</file>
-    <file>rotateleft.png</file>
-    <file>rotateright.png</file>
-    <file>fileprint.png</file>
-</qresource>
-</RCC>
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
deleted file mode 100644 (file)
index 2208ade..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwindow.h"
-
-#include <QApplication>
-
-int main(int argc, char **argv)
-{
-    Q_INIT_RESOURCE(images);
-
-    QApplication app(argc, argv);
-    app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
-
-    MainWindow window;
-    window.show();   
-
-    return app.exec();
-}
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.cpp
deleted file mode 100644 (file)
index 06f4fe5..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwindow.h"
-#include "view.h"
-#include "chip.h"
-
-#include <QtGui>
-
-MainWindow::MainWindow(QWidget *parent)
-    : QWidget(parent)
-{
-    populateScene();
-
-    View *view = new View("Top left view");
-    view->view()->setScene(scene);
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->addWidget(view);
-    setLayout(layout);
-
-    setWindowTitle(tr("Chip Demo"));
-}
-
-void MainWindow::populateScene()
-{
-    scene = new QGraphicsScene;
-
-    QImage image(":/qt4logo.png");
-
-    // Populate scene
-    int xx = 0;
-    int nitems = 0;
-    for (int i = -11000; i < 11000; i += 110) {
-        ++xx;
-        int yy = 0;
-        for (int j = -7000; j < 7000; j += 70) {
-            ++yy;
-            qreal x = (i + 11000) / 22000.0;
-            qreal y = (j + 7000) / 14000.0;
-
-            QColor color(image.pixel(int(image.width() * x), int(image.height() * y)));
-            QGraphicsItem *item = new Chip(color, xx, yy);
-            item->setPos(QPointF(i, j));
-            scene->addItem(item);
-
-            ++nitems;
-        }
-    }
-}
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
deleted file mode 100644 (file)
index 32fbad0..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QtGui/qwidget.h>
-#include <QtGui/qgraphicsscene.h>
-
-class MainWindow : public QWidget
-{
-    Q_OBJECT
-public:
-    MainWindow(QWidget *parent = 0);
-    
-private:
-    void setupMatrix();
-    void populateScene();
-
-    QGraphicsScene *scene;
-};
-
-#endif
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/qt4logo.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/qt4logo.png
deleted file mode 100644 (file)
index 157e86e..0000000
Binary files a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/qt4logo.png and /dev/null differ
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateleft.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateleft.png
deleted file mode 100644 (file)
index 8cfa931..0000000
Binary files a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateleft.png and /dev/null differ
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateright.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateright.png
deleted file mode 100644 (file)
index ec5e866..0000000
Binary files a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/rotateright.png and /dev/null differ
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
deleted file mode 100644 (file)
index 1b9c6da..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "view.h"
-
-#include <QtGui>
-
-#ifdef Q_WS_WIN
-#define CALLGRIND_START_INSTRUMENTATION  {}
-#define CALLGRIND_STOP_INSTRUMENTATION   {}
-#else
-#include "valgrind/callgrind.h"
-#endif
-
-#ifndef QT_NO_OPENGL
-#include <QtOpenGL>
-#endif
-
-#include <qmath.h>
-
-class CountView : public QGraphicsView
-{
-protected:
-    void paintEvent(QPaintEvent *event)
-    {
-        static int n = 0;
-        if (n)
-            CALLGRIND_START_INSTRUMENTATION
-        QGraphicsView::paintEvent(event);
-        if (n)
-            CALLGRIND_STOP_INSTRUMENTATION
-        if (++n == 500)
-            qApp->quit();
-    }
-};
-
-View::View(const QString &name, QWidget *parent)
-    : QFrame(parent)
-{
-    setFrameStyle(Sunken | StyledPanel);
-    graphicsView = new CountView;
-    graphicsView->setRenderHint(QPainter::Antialiasing, false);
-    graphicsView->setDragMode(QGraphicsView::RubberBandDrag);
-    graphicsView->setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
-
-    int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
-    QSize iconSize(size, size);
-
-    QToolButton *zoomInIcon = new QToolButton;
-    zoomInIcon->setAutoRepeat(true);
-    zoomInIcon->setAutoRepeatInterval(33);
-    zoomInIcon->setAutoRepeatDelay(0);
-    zoomInIcon->setIcon(QPixmap(":/zoomin.png"));
-    zoomInIcon->setIconSize(iconSize);
-    QToolButton *zoomOutIcon = new QToolButton;
-    zoomOutIcon->setAutoRepeat(true);
-    zoomOutIcon->setAutoRepeatInterval(33);
-    zoomOutIcon->setAutoRepeatDelay(0);
-    zoomOutIcon->setIcon(QPixmap(":/zoomout.png"));
-    zoomOutIcon->setIconSize(iconSize);
-    zoomSlider = new QSlider;
-    zoomSlider->setMinimum(0);
-    zoomSlider->setMaximum(500);
-    zoomSlider->setValue(250);
-    zoomSlider->setTickPosition(QSlider::TicksRight);
-
-    // Zoom slider layout
-    QVBoxLayout *zoomSliderLayout = new QVBoxLayout;
-    zoomSliderLayout->addWidget(zoomInIcon);
-    zoomSliderLayout->addWidget(zoomSlider);
-    zoomSliderLayout->addWidget(zoomOutIcon);
-
-    QToolButton *rotateLeftIcon = new QToolButton;
-    rotateLeftIcon->setIcon(QPixmap(":/rotateleft.png"));
-    rotateLeftIcon->setIconSize(iconSize);
-    QToolButton *rotateRightIcon = new QToolButton;
-    rotateRightIcon->setIcon(QPixmap(":/rotateright.png"));
-    rotateRightIcon->setIconSize(iconSize);
-    rotateSlider = new QSlider;
-    rotateSlider->setOrientation(Qt::Horizontal);
-    rotateSlider->setMinimum(-360);
-    rotateSlider->setMaximum(360);
-    rotateSlider->setValue(0);
-    rotateSlider->setTickPosition(QSlider::TicksBelow);
-
-    // Rotate slider layout
-    QHBoxLayout *rotateSliderLayout = new QHBoxLayout;
-    rotateSliderLayout->addWidget(rotateLeftIcon);
-    rotateSliderLayout->addWidget(rotateSlider);
-    rotateSliderLayout->addWidget(rotateRightIcon);
-
-    resetButton = new QToolButton;
-    resetButton->setText(tr("0"));
-    resetButton->setEnabled(false);
-
-    // Label layout
-    QHBoxLayout *labelLayout = new QHBoxLayout;
-    label = new QLabel(name);
-    antialiasButton = new QToolButton;
-    antialiasButton->setText(tr("Antialiasing"));
-    antialiasButton->setCheckable(true);
-    antialiasButton->setChecked(false);
-    openGlButton = new QToolButton;
-    openGlButton->setText(tr("OpenGL"));
-    openGlButton->setCheckable(true);
-#ifndef QT_NO_OPENGL
-    openGlButton->setEnabled(QGLFormat::hasOpenGL());
-#else
-    openGlButton->setEnabled(false);
-#endif
-    printButton = new QToolButton;
-    printButton->setIcon(QIcon(QPixmap(":/fileprint.png")));
-
-    labelLayout->addWidget(label);
-    labelLayout->addStretch();
-    labelLayout->addWidget(antialiasButton);
-    labelLayout->addWidget(openGlButton);
-    labelLayout->addWidget(printButton);
-
-    QGridLayout *topLayout = new QGridLayout;
-    topLayout->addLayout(labelLayout, 0, 0);
-    topLayout->addWidget(graphicsView, 1, 0);
-    topLayout->addLayout(zoomSliderLayout, 1, 1);
-    topLayout->addLayout(rotateSliderLayout, 2, 0);
-    topLayout->addWidget(resetButton, 2, 1);
-    setLayout(topLayout);
-
-    connect(resetButton, SIGNAL(clicked()), this, SLOT(resetView()));
-    connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
-    connect(rotateSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
-    connect(graphicsView->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
-    connect(graphicsView->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
-    connect(antialiasButton, SIGNAL(toggled(bool)), this, SLOT(toggleAntialiasing()));
-    connect(openGlButton, SIGNAL(toggled(bool)), this, SLOT(toggleOpenGL()));
-    connect(rotateLeftIcon, SIGNAL(clicked()), this, SLOT(rotateLeft()));
-    connect(rotateRightIcon, SIGNAL(clicked()), this, SLOT(rotateRight()));
-    connect(zoomInIcon, SIGNAL(clicked()), this, SLOT(zoomIn()));
-    connect(zoomOutIcon, SIGNAL(clicked()), this, SLOT(zoomOut()));
-    connect(printButton, SIGNAL(clicked()), this, SLOT(print()));
-
-    setupMatrix();
-
-    startTimer(0);
-}
-
-QGraphicsView *View::view() const
-{
-    return graphicsView;
-}
-
-void View::resetView()
-{
-    zoomSlider->setValue(250);
-    rotateSlider->setValue(0);
-    setupMatrix();
-    graphicsView->ensureVisible(QRectF(0, 0, 0, 0));
-
-    resetButton->setEnabled(false);
-}
-
-void View::setResetButtonEnabled()
-{
-    resetButton->setEnabled(true);
-}
-
-void View::setupMatrix()
-{
-    qreal scale = qPow(qreal(2), (zoomSlider->value() - 250) / qreal(50));
-
-    QMatrix matrix;
-    matrix.scale(scale, scale);
-    matrix.rotate(rotateSlider->value());
-
-    graphicsView->setMatrix(matrix);
-    setResetButtonEnabled();
-}
-
-void View::toggleOpenGL()
-{
-#ifndef QT_NO_OPENGL
-    graphicsView->setViewport(openGlButton->isChecked() ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
-#endif
-}
-
-void View::toggleAntialiasing()
-{
-    graphicsView->setRenderHint(QPainter::Antialiasing, antialiasButton->isChecked());
-}
-
-void View::print()
-{
-#ifndef QT_NO_PRINTER
-    QPrinter printer;
-    QPrintDialog dialog(&printer, this);
-    if (dialog.exec() == QDialog::Accepted) {
-        QPainter painter(&printer);
-        graphicsView->render(&painter);
-    }
-#endif
-}
-
-void View::zoomIn()
-{
-    zoomSlider->setValue(zoomSlider->value() + 1);
-}
-
-void View::zoomOut()
-{
-    zoomSlider->setValue(zoomSlider->value() - 1);
-}
-
-void View::rotateLeft()
-{
-    rotateSlider->setValue(rotateSlider->value() - 10);
-}
-
-void View::rotateRight()
-{
-    rotateSlider->setValue(rotateSlider->value() + 10);
-}
-
-void View::timerEvent(QTimerEvent *)
-{
-    graphicsView->horizontalScrollBar()->setValue(graphicsView->horizontalScrollBar()->value() + 1);
-}
-
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
deleted file mode 100644 (file)
index dc2bd44..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef VIEW_H
-#define VIEW_H
-
-#include <QFrame>
-#include <QGraphicsView>
-#include <QLabel>
-#include <QSlider>
-#include <QToolButton>
-
-class View : public QFrame
-{
-    Q_OBJECT
-public:
-    View(const QString &name, QWidget *parent = 0);
-
-    QGraphicsView *view() const;
-
-private slots:
-    void resetView();
-    void setResetButtonEnabled();
-    void setupMatrix();
-    void toggleOpenGL();
-    void toggleAntialiasing();
-    void print();
-
-    void zoomIn();
-    void zoomOut();
-    void rotateLeft();
-    void rotateRight();
-
-    void timerEvent(QTimerEvent *);
-    
-private:
-    QGraphicsView *graphicsView;
-    QLabel *label;
-    QToolButton *openGlButton;
-    QToolButton *antialiasButton;
-    QToolButton *printButton;
-    QToolButton *resetButton;
-    QSlider *zoomSlider;
-    QSlider *rotateSlider;
-};
-
-#endif
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomin.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomin.png
deleted file mode 100644 (file)
index 8b0daee..0000000
Binary files a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomin.png and /dev/null differ
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomout.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomout.png
deleted file mode 100644 (file)
index 1575dd2..0000000
Binary files a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/zoomout.png and /dev/null differ
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
deleted file mode 100644 (file)
index 92f57d6..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtGui>
-
-#ifdef Q_WS_WIN
-#define CALLGRIND_START_INSTRUMENTATION  {}
-#define CALLGRIND_STOP_INSTRUMENTATION   {}
-#else
-#include "valgrind/callgrind.h"
-#endif
-
-#ifdef Q_WS_X11
-extern void qt_x11_wait_for_window_manager(QWidget *);
-#endif
-
-class View : public QGraphicsView
-{
-    Q_OBJECT
-public:
-    View(QGraphicsScene *scene, QGraphicsItem *item)
-        : QGraphicsView(scene), _item(item)
-    {
-    }
-
-protected:
-    void paintEvent(QPaintEvent *event)
-    {
-        static int n = 0;
-        if (n)
-            CALLGRIND_START_INSTRUMENTATION
-        QGraphicsView::paintEvent(event);
-        _item->moveBy(1, 1);
-        if (n)
-            CALLGRIND_STOP_INSTRUMENTATION
-        if (++n == 200)
-            qApp->quit();
-    }
-
-private:
-    QGraphicsItem *_item;
-};
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    if (argc < 2) {
-        qDebug("usage: ./%s <numItems>", argv[0]);
-        return 1;
-    }
-
-    QGraphicsScene scene(-150, -150, 300, 300);
-    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
-
-    QGraphicsRectItem *item = scene.addRect(-50, -50, 100, 100, QPen(Qt::NoPen), QBrush(Qt::blue));
-    item->setFlag(QGraphicsItem::ItemIsMovable);
-
-    for (int i = 0; i < atoi(argv[1]); ++i) {
-        QGraphicsRectItem *child = scene.addRect(-5, -5, 10, 10, QPen(Qt::NoPen), QBrush(Qt::blue));
-        child->setPos(-50 + qrand() % 100, -50 + qrand() % 100);
-        child->setParentItem(item);
-    }
-
-    View view(&scene, item);
-    view.resize(300, 300);
-    view.show();
-#ifdef Q_WS_X11
-    qt_x11_wait_for_window_manager(&view);
-#endif
-
-    return app.exec();
-}
-
-#include "moc_main.cpp"
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro
deleted file mode 100644 (file)
index 28dcadc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += main.cpp
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
deleted file mode 100644 (file)
index af54ea7..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2019 Ivailo Monev
-**
-** This file is part of the test suite of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtGui>
-
-#ifdef Q_WS_WIN
-#define CALLGRIND_START_INSTRUMENTATION  {}
-#define CALLGRIND_STOP_INSTRUMENTATION   {}
-#else
-#include "valgrind/callgrind.h"
-#endif
-
-class ItemMover : public QObject
-{
-    Q_OBJECT
-public:
-    ItemMover(QGraphicsItem *item)
-        : _item(item)
-    {
-        startTimer(0);
-    }
-
-protected:
-    void timerEvent(QTimerEvent *event)
-    {
-        _item->moveBy(-1, 0);
-    }
-
-private:
-    QGraphicsItem *_item;
-};
-
-class ClipItem : public QGraphicsRectItem
-{
-public:
-    ClipItem(qreal x, qreal y, qreal w, qreal h, const QPen &pen, const QBrush &brush)
-        : QGraphicsRectItem(x, y, w, h)
-    {
-        setPen(pen);
-        setBrush(brush);
-    }
-
-    QPainterPath shape() const
-    {
-        QPainterPath path;
-        path.addRect(rect());
-        return path;
-    }
-};
-
-class CountView : public QGraphicsView
-{
-protected:
-    void paintEvent(QPaintEvent *event)
-    {
-        static int n = 0;
-        if (n)
-            CALLGRIND_START_INSTRUMENTATION
-        QGraphicsView::paintEvent(event);
-        if (n)
-            CALLGRIND_STOP_INSTRUMENTATION
-        if (++n == 500)
-            qApp->quit();
-    }
-};
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QGraphicsScene scene;
-    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
-
-    ClipItem *clipItem = new ClipItem(0, 0, 100, 100, QPen(), QBrush(Qt::blue));
-    clipItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
-    clipItem->setData(0, "clipItem");
-    scene.addItem(clipItem);
-
-    QGraphicsRectItem *scrollItem = scene.addRect(0, 0, 10, 10, QPen(Qt::NoPen), QBrush(Qt::NoBrush));
-    scrollItem->setParentItem(clipItem);
-    scrollItem->setFlag(QGraphicsItem::ItemIsMovable);
-    scrollItem->setData(0, "scrollItem");
-
-    for (int y = 0; y < 25; ++y) {
-        for (int x = 0; x < 25; ++x) {
-            ClipItem *rect = new ClipItem(0, 0, 90, 20, QPen(Qt::NoPen), QBrush(Qt::green));
-            rect->setParentItem(scrollItem);
-            rect->setPos(x * 95, y * 25);
-            rect->setData(0, qPrintable(QString("rect %1 %2").arg(x).arg(y)));
-            rect->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
-
-            QGraphicsEllipseItem *ellipse = new QGraphicsEllipseItem(-5, -5, 10, 10);
-            ellipse->setPen(QPen(Qt::NoPen));
-            ellipse->setBrush(QBrush(Qt::yellow));
-            ellipse->setParentItem(rect);
-            ellipse->setData(0, qPrintable(QString("ellipse %1 %2").arg(x).arg(y)));
-        }
-    }
-
-    scrollItem->setRect(scrollItem->childrenBoundingRect());
-
-#if 0
-    ItemMover mover(scrollItem);
-#endif
-
-    CountView view;
-    view.setScene(&scene);
-    view.setSceneRect(-25, -25, 150, 150);
-    view.resize(300, 300);
-    view.show();
-
-    return app.exec();
-}
-
-#include "moc_main.cpp"
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro
deleted file mode 100644 (file)
index 28dcadc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES += main.cpp