diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:18:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 12:18:02 (GMT) |
commit | 27e403d9c6185c606980bb7881e39a2c88138a13 (patch) | |
tree | 5abe2f83832f9c2a7b3ef1804f4a79d89fa8b831 /src/declarative/graphicsitems/qdeclarativeimage_p_p.h | |
parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
parent | 67bb989e11cf47431e419966bff7257c028ea958 (diff) | |
download | Qt-27e403d9c6185c606980bb7881e39a2c88138a13.zip Qt-27e403d9c6185c606980bb7881e39a2c88138a13.tar.gz Qt-27e403d9c6185c606980bb7881e39a2c88138a13.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (139 commits)
Fixed qdeclarativeconnection test.
missed rename
Revert "Some animation cleanup/refactoring."
Rename files to follow class name.
Change Connection syntax as per QT-2822.
Doc
update painted geometry on pixmapChanged rather than sourceChanged
Make Flickable overshoot behavior nicer.
Polish QDeclarativeProperty API
Test, demo, and work-around bug QTBUG-8535
Fix ParentAnimation crash.
Tiny doc tweak.
Work around requires() bug in qmake
Make sure that QEasingCurve::type when streamed is a quint8, as documented
Add QEasingCurve to datastream format docs
Move QEasingCurve datastream autotest to qdatastream for more comprehensive tests
Some animation cleanup/refactoring.
Fix Flickable.overShoot doc - it is a bool not a real
Rebuild since -declarative auto detection changed.
Renamed Flickable viewportXXX properties contentXXX
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimage_p_p.h')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimage_p_p.h | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h new file mode 100644 index 0000000..8102237 --- /dev/null +++ b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVEIMAGE_P_H +#define QDECLARATIVEIMAGE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qdeclarativeitem_p.h" +#include "qdeclarativeimagebase_p_p.h" + +QT_BEGIN_NAMESPACE + +class QDeclarativeImagePrivate : public QDeclarativeImageBasePrivate +{ + Q_DECLARE_PUBLIC(QDeclarativeImage) + +public: + QDeclarativeImagePrivate() + : fillMode(QDeclarativeImage::Stretch), paintedWidth(0), paintedHeight(0) + { + } + + QDeclarativeImage::FillMode fillMode; + qreal paintedWidth; + qreal paintedHeight; + void setPixmap(const QPixmap &pix); +}; + +QT_END_NAMESPACE + +#endif // QDECLARATIVEIMAGE_P_H |