summaryrefslogtreecommitdiffstats
path: root/tests/manual/qimagereader/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/qimagereader/main.cpp')
-rw-r--r--tests/manual/qimagereader/main.cpp35
1 files changed, 5 insertions, 30 deletions
diff --git a/tests/manual/qimagereader/main.cpp b/tests/manual/qimagereader/main.cpp
index cf86162022..c4ea74b6d2 100644
--- a/tests/manual/qimagereader/main.cpp
+++ b/tests/manual/qimagereader/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QWidget>
#include <QHBoxLayout>
@@ -42,7 +17,7 @@ public:
}
- virtual void paintEvent(QPaintEvent * /*event*/)
+ void paintEvent(QPaintEvent * /*event*/) override
{
QPainter painter(this);
QImageReader reader(fileName);
@@ -79,8 +54,8 @@ int main(int argc, char** argv)
mainWidget.setWindowTitle("Colors in images are identical?");
mainWidget.setMinimumSize(400,400);
QHBoxLayout *l = new QHBoxLayout;
- MyWidget *w1 = new MyWidget(&mainWidget,"Qt_logostrap_CMYK.jpg", false);
- MyWidget *w2 = new MyWidget(&mainWidget,"Qt_logostrap_CMYK.jpg", true);
+ MyWidget *w1 = new MyWidget(&mainWidget,":/Qt_logostrap_CMYK.jpg", false);
+ MyWidget *w2 = new MyWidget(&mainWidget,":/Qt_logostrap_CMYK.jpg", true);
l->addWidget(w1);
l->addWidget(w2);
mainWidget.setLayout(l);