diff options
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturereader.cpp')
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturereader.cpp | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturereader.cpp b/src/quick/scenegraph/util/qsgtexturereader.cpp index 5e12ca4035..e0704af553 100644 --- a/src/quick/scenegraph/util/qsgtexturereader.cpp +++ b/src/quick/scenegraph/util/qsgtexturereader.cpp @@ -1,59 +1,16 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qsgtexturereader_p.h" #include <private/qtexturefilereader_p.h> -#if QT_CONFIG(opengl) #include <private/qsgcompressedtexture_p.h> -#endif QT_BEGIN_NAMESPACE QSGTextureReader::QSGTextureReader(QIODevice *device, const QString &fileName) { -#if QT_CONFIG(opengl) m_reader = new QTextureFileReader(device, fileName); -#else - Q_UNUSED(device); - Q_UNUSED(fileName); -#endif } QSGTextureReader::~QSGTextureReader() @@ -63,7 +20,6 @@ QSGTextureReader::~QSGTextureReader() QQuickTextureFactory *QSGTextureReader::read() { -#if QT_CONFIG(opengl) if (!m_reader) return nullptr; @@ -72,9 +28,6 @@ QQuickTextureFactory *QSGTextureReader::read() return nullptr; return new QSGCompressedTextureFactory(texData); -#else - return nullptr; -#endif } bool QSGTextureReader::isTexture() |