diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 07:38:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 07:38:01 (GMT) |
| commit | 98f76dbc2eb76d67d8ef5074b5e1c380bb72fe8e (patch) | |
| tree | 0cf26ece4f06362ae9214f4b900996efbbfbc700 /src/gui/kernel | |
| parent | 75c5bc5f7efd5f7055b689a244147e69733280a4 (diff) | |
| parent | e231da119daec62c0aa2cee055c539154a0f935d (diff) | |
| download | Qt-98f76dbc2eb76d67d8ef5074b5e1c380bb72fe8e.zip Qt-98f76dbc2eb76d67d8ef5074b5e1c380bb72fe8e.tar.gz Qt-98f76dbc2eb76d67d8ef5074b5e1c380bb72fe8e.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:
Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing)
Add test and fix style for the SSE2 implementation of ARGB32 conversion
Build fix, the header of QImageData did not declare QImageWriter.
SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImage
Moved primitive SSE2 painting utilities to qdrawingprimitive_sse2_p.h
Move logic for building SIMD extensions to gui.pro
Fix text drawing into alpha pixmap with opengl engine
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index ccfe88c..94211fd 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -902,6 +902,7 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, #endif // Q_WS_X11 extern void qInitDrawhelperAsm(); +extern void qInitImageConversions(); extern int qRegisterGuiVariant(); extern int qUnregisterGuiVariant(); #ifndef QT_NO_STATEMACHINE @@ -959,6 +960,8 @@ void QApplicationPrivate::initialize() // Set up which span functions should be used in raster engine... qInitDrawhelperAsm(); + // and QImage conversion functions + qInitImageConversions(); #ifndef QT_NO_WHEELEVENT QApplicationPrivate::wheel_scroll_lines = 3; |