diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 10:18:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 10:18:25 (GMT) |
| commit | 33d20d417ea9387b449de96097c3d2b5913a0533 (patch) | |
| tree | e70a742071e9c7e92f53dd375a444097b117199b /src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h | |
| parent | 3e94b3a77affeef80544e48949e018ced4e0d96e (diff) | |
| parent | 3c3d5521a94254bf3ce5591e8a326005fcb4d3b1 (diff) | |
| download | Qt-33d20d417ea9387b449de96097c3d2b5913a0533.zip Qt-33d20d417ea9387b449de96097c3d2b5913a0533.tar.gz Qt-33d20d417ea9387b449de96097c3d2b5913a0533.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits)
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
Safeguard ourselves against corrupt registry values for cleartype gamma
fix cetest build properly
qdrawhelper: optimize the fetch transformed bilinear functions
Compile fix for WinCE
Make sure the selectionChanged signal is not called too much
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h index 9d8087c..5981cd3 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h @@ -44,6 +44,8 @@ #include "private/qdeclarativeimage_p.h" +#ifndef QT_NO_MOVIE + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -108,4 +110,6 @@ QML_DECLARE_TYPE(QDeclarativeAnimatedImage) QT_END_HEADER +#endif // QT_NO_MOVIE + #endif |