diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 22:42:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 22:42:02 (GMT) |
| commit | 16e8cc808ae7087aadd95855c97d715941711b45 (patch) | |
| tree | fb6d5b9c8a550f27e8ef03bb2b5768f89d560d1d /src/gui/painting | |
| parent | b80466364fe6c6ca030b884f2d8df94bdfa477b9 (diff) | |
| parent | 7baaea978200c82fdf65e3934cfa373edeca6524 (diff) | |
| download | Qt-16e8cc808ae7087aadd95855c97d715941711b45.zip Qt-16e8cc808ae7087aadd95855c97d715941711b45.tar.gz Qt-16e8cc808ae7087aadd95855c97d715941711b45.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:
Slow QTreeView::layout() with many (> 10000) children
Fixed "inconsistent dll linkage" warning on Windows.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qmemrotate_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h index 8df0520..2911860 100644 --- a/src/gui/painting/qmemrotate_p.h +++ b/src/gui/painting/qmemrotate_p.h @@ -82,8 +82,9 @@ QT_BEGIN_NAMESPACE void Q_GUI_QWS_EXPORT qt_memrotate270(const srctype*, int, int, int, desttype*, int) void Q_GUI_EXPORT qt_memrotate90(const quint32*, int, int, int, quint32*, int); +void Q_GUI_QWS_EXPORT qt_memrotate180(const quint32*, int, int, int, quint32*, int); +void Q_GUI_QWS_EXPORT qt_memrotate270(const quint32*, int, int, int, quint32*, int); -QT_DECL_MEMROTATE(quint32, quint32); QT_DECL_MEMROTATE(quint32, quint16); QT_DECL_MEMROTATE(quint16, quint32); QT_DECL_MEMROTATE(quint16, quint16); |