diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 13:00:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 13:00:57 (GMT) |
| commit | 405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6 (patch) | |
| tree | 0122507f3c5ca236db3139fba231685297138f4a /src/declarative/graphicsitems/qdeclarativeimage_p.h | |
| parent | 8968c79c575755cdb52d5e615ed19e4529047464 (diff) | |
| parent | 9fc5c260858559662e156865e4666e5a91452cc2 (diff) | |
| download | Qt-405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6.zip Qt-405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6.tar.gz Qt-405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits)
Reseted QtDeclarative module def files
Get WebView tests passing again
Remove arbitrary width checks
Removed compilation warning for systems with no OpenGL support
Fix bug in SameGame's dialog component
doc fix
Add abstractitemmodel example, and fix some model docs
docs - quote code with snippets, other improvements
Fix webkit import for webkit tests.
Remove qmlviewer dependency on QDeclarativeTimer
Remove a few more unnecessary exports.
Don't export declarative private classes
Add additional text layout benchmarks.
Don't access uninitialized value.
Minor Twitter demo enhancements
Added SET_BINDING message to QDeclarative debugger protocol
Add ListView.nextSection attached property
Remove the old font.outline documentation
Docs - add more links to relevant examples
Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimage_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimage_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h index fa5b2a9..a4f4475 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeImagePrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeImage : public QDeclarativeImageBase +class Q_AUTOTEST_EXPORT QDeclarativeImage : public QDeclarativeImageBase { Q_OBJECT Q_ENUMS(FillMode) |