diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-27 15:35:30 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-05-20 11:12:40 +0000 |
commit | 56e03ad1ab1e2971d5e406608d78352ebebc2bea (patch) | |
tree | 9aa11064867e04a28b341a45f2d6fe8fef0d54d6 /src | |
parent | 2c7ba5ed6f9a29d0ce4374bd4aedc20fdfe513c8 (diff) |
Add qtexture_p.h
Change-Id: I72c95a9e50646d822ec1508acedf775082a19c9d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/render/texture/qtexture.cpp | 14 | ||||
-rw-r--r-- | src/render/texture/qtexture_p.h | 72 | ||||
-rw-r--r-- | src/render/texture/texture.pri | 3 |
3 files changed, 78 insertions, 11 deletions
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp index 45aacae73..737f74f95 100644 --- a/src/render/texture/qtexture.cpp +++ b/src/render/texture/qtexture.cpp @@ -41,22 +41,16 @@ #include "qabstracttextureimage.h" #include "qtextureimage_p.h" #include "qtexture.h" -#include "qabstracttexture_p.h" +#include "qtexture_p.h" QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QTextureLoaderPrivate : public QAbstractTexturePrivate +QTextureLoaderPrivate::QTextureLoaderPrivate() + : QAbstractTexturePrivate() { -public: - QTextureLoaderPrivate() - : QAbstractTexturePrivate() - { - } - - QUrl m_source; -}; +} /*! \class Qt3DRender::QTexture1D diff --git a/src/render/texture/qtexture_p.h b/src/render/texture/qtexture_p.h new file mode 100644 index 000000000..754bc206e --- /dev/null +++ b/src/render/texture/qtexture_p.h @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D 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$ +** +****************************************************************************/ + +#ifndef QT3DRENDER_QTEXTURE_P_H +#define QT3DRENDER_QTEXTURE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <Qt3DRender/private/qabstracttexture_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { + +class QTextureLoaderPrivate : public QAbstractTexturePrivate +{ +public: + QTextureLoaderPrivate(); + + QUrl m_source; +}; + +} // namespace Qt3DRender + +QT_END_NAMESPACE + +#endif // QT3DRENDER_QTEXTURE_P_H diff --git a/src/render/texture/texture.pri b/src/render/texture/texture.pri index 145a70ea8..a4d419f07 100644 --- a/src/render/texture/texture.pri +++ b/src/render/texture/texture.pri @@ -17,7 +17,8 @@ HEADERS += \ $$PWD/qtextureimagedata.h \ $$PWD/qtexturedata.h \ $$PWD/qtextureimagedatagenerator.h \ - $$PWD/qtexturegenerator.h + $$PWD/qtexturegenerator.h \ + $$PWD/qtexture_p.h SOURCES += \ $$PWD/qabstracttextureimage.cpp \ |