Changeset 846 for trunk/include/QtGui/private

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• include/QtGui/private/qblendfunctions_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qblendfunctions_p.h )
• include/QtGui/private/qdrawhelper_arm_simd_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qdrawhelper_arm_simd_p.h )
• include/QtGui/private/qdrawhelper_armv6_p.h (deleted)
• include/QtGui/private/qdrawingprimitive_sse2_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qdrawingprimitive_sse2_p.h )
• include/QtGui/private/qeglcontext_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qeglcontext_p.h )
• include/QtGui/private/qfiledialog_win_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qfiledialog_win_p.h )
• include/QtGui/private/qgifhandler_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qgifhandler_p.h )
• include/QtGui/private/qgraphicssystem_runtime_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qgraphicssystem_runtime_p.h )
• include/QtGui/private/qjpeghandler_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qjpeghandler_p.h )
• include/QtGui/private/qmacstyle_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qmacstyle_mac_p.h )
• include/QtGui/private/qmnghandler_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qmnghandler_p.h )
• include/QtGui/private/qstatictext_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qstatictext_p.h )
• include/QtGui/private/qtiffhandler_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/QtGui/private/qtiffhandler_p.h )