aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlimageprovider.h
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-03-05 17:01:33 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-07 02:33:24 +0100
commit3bc907d155034fe64efc8cb6056b48f0c6401bfb (patch)
treea1fb0ddfa50f136e66a177e3147546690a0c429e /src/qml/qml/qqmlimageprovider.h
parentcd0c9ae4ccc43503b6d8fb93bc87092cfa328adc (diff)
Remove uses of QtGui symbols in QQmlEngine.
Move the code dealing with QImage and QPixmap out of QQmlEngine and into the QtQuick library. QQmlEngine remains the owner of image provider resources, but does not use them directly. Change-Id: I52083581394d9c308db446372883eb7479ccf807 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlimageprovider.h')
-rw-r--r--src/qml/qml/qqmlimageprovider.h96
1 files changed, 0 insertions, 96 deletions
diff --git a/src/qml/qml/qqmlimageprovider.h b/src/qml/qml/qqmlimageprovider.h
deleted file mode 100644
index fe06925123..0000000000
--- a/src/qml/qml/qqmlimageprovider.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** 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.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLIMAGEPROVIDER_H
-#define QQMLIMAGEPROVIDER_H
-
-#include <QtQml/qtqmlglobal.h>
-#include <QtGui/qimage.h>
-#include <QtGui/qpixmap.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-
-class QQmlImageProviderPrivate;
-class QSGTexture;
-class QQuickCanvas;
-
-class Q_QML_EXPORT QQuickTextureFactory : public QObject
-{
-public:
- QQuickTextureFactory();
- virtual ~QQuickTextureFactory();
-
- virtual QSGTexture *createTexture(QQuickCanvas *canvas) const = 0;
- virtual QSize textureSize() const = 0;
- virtual int textureByteCount() const = 0;
-};
-
-class Q_QML_EXPORT QQmlImageProvider
-{
-public:
- enum ImageType {
- Image,
- Pixmap,
- Texture,
- Invalid
- };
-
- QQmlImageProvider(ImageType type);
- virtual ~QQmlImageProvider();
-
- ImageType imageType() const;
-
- virtual QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize);
- virtual QPixmap requestPixmap(const QString &id, QSize *size, const QSize& requestedSize);
- virtual QQuickTextureFactory *requestTexture(const QString &id, QSize *size, const QSize &requestedSize);
-
-private:
- QQmlImageProviderPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QQMLIMAGEPROVIDER