Changeset 561 for trunk/include/QtGui/private
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 3 deleted
- 1 edited
- 63 copied
-
. (modified) (1 prop)
-
include/QtGui/private/gtksymbols_p.h (deleted)
-
include/QtGui/private/qbasickeyeventtransition_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qbasickeyeventtransition_p.h )
-
include/QtGui/private/qbasicmouseeventtransition_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qbasicmouseeventtransition_p.h )
-
include/QtGui/private/qcocoasharedwindowmethods_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qcocoasharedwindowmethods_mac_p.h )
-
include/QtGui/private/qcoefepinputcontext_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qcoefepinputcontext_p.h )
-
include/QtGui/private/qdrawhelper_armv6_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qdrawhelper_armv6_p.h )
-
include/QtGui/private/qdrawhelper_neon_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qdrawhelper_neon_p.h )
-
include/QtGui/private/qegl_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qegl_p.h )
-
include/QtGui/private/qeglproperties_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qeglproperties_p.h )
-
include/QtGui/private/qeventdispatcher_glib_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qeventdispatcher_glib_qws_p.h )
-
include/QtGui/private/qeventdispatcher_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qeventdispatcher_qws_p.h )
-
include/QtGui/private/qeventdispatcher_s60_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qeventdispatcher_s60_p.h )
-
include/QtGui/private/qfontengine_s60_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qfontengine_s60_p.h )
-
include/QtGui/private/qfscompleter_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qfscompleter_p.h )
-
include/QtGui/private/qgesture_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgesture_p.h )
-
include/QtGui/private/qgesturemanager_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgesturemanager_p.h )
-
include/QtGui/private/qgraph_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraph_p.h )
-
include/QtGui/private/qgraphicsanchorlayout_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicsanchorlayout_p.h )
-
include/QtGui/private/qgraphicseffect_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicseffect_p.h )
-
include/QtGui/private/qgraphicsscenebsptreeindex_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicsscenebsptreeindex_p.h )
-
include/QtGui/private/qgraphicssceneindex_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicssceneindex_p.h )
-
include/QtGui/private/qgraphicsscenelinearindex_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicsscenelinearindex_p.h )
-
include/QtGui/private/qgraphicssystem_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicssystem_qws_p.h )
-
include/QtGui/private/qgraphicstransform_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgraphicstransform_p.h )
-
include/QtGui/private/qgtkstyle_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qgtkstyle_p.h )
-
include/QtGui/private/qguiplatformplugin_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qguiplatformplugin_p.h )
-
include/QtGui/private/qicon_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qicon_p.h )
-
include/QtGui/private/qiconloader_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qiconloader_p.h )
-
include/QtGui/private/qimagepixmapcleanuphooks_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qimagepixmapcleanuphooks_p.h )
-
include/QtGui/private/qkbd_defaultmap_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qkbd_defaultmap_qws_p.h )
-
include/QtGui/private/qkbd_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qkbd_qws_p.h )
-
include/QtGui/private/qkde_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qkde_p.h )
-
include/QtGui/private/qlinecontrol_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qlinecontrol_p.h )
-
include/QtGui/private/qlock_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qlock_p.h )
-
include/QtGui/private/qmacgesturerecognizer_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qmacgesturerecognizer_mac_p.h )
-
include/QtGui/private/qmenu_wince_resource_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qmenu_wince_resource_p.h )
-
include/QtGui/private/qmultitouch_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qmultitouch_mac_p.h )
-
include/QtGui/private/qpaintbuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qpaintbuffer_p.h )
-
include/QtGui/private/qpaintengine_d3d_p.h (deleted)
-
include/QtGui/private/qpaintengine_s60_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qpaintengine_s60_p.h )
-
include/QtGui/private/qpixmap_s60_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qpixmap_s60_p.h )
-
include/QtGui/private/qpixmapcache_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qpixmapcache_p.h )
-
include/QtGui/private/qprintengine_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qprintengine_qws_p.h )
-
include/QtGui/private/qproxystyle_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qproxystyle_p.h )
-
include/QtGui/private/qs60mainapplication_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qs60mainapplication_p.h )
-
include/QtGui/private/qs60style_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qs60style_p.h )
-
include/QtGui/private/qscreenmulti_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qscreenmulti_qws_p.h )
-
include/QtGui/private/qsimplex_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qsimplex_p.h )
-
include/QtGui/private/qsoftkeymanager_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qsoftkeymanager_p.h )
-
include/QtGui/private/qstandardgestures_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qstandardgestures_p.h )
-
include/QtGui/private/qstylehelper_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qstylehelper_p.h )
-
include/QtGui/private/qt_s60_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qt_s60_p.h )
-
include/QtGui/private/qtransportauth_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qtransportauth_qws_p.h )
-
include/QtGui/private/qunixsocket_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qunixsocket_p.h )
-
include/QtGui/private/qunixsocketserver_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qunixsocketserver_p.h )
-
include/QtGui/private/qwindowsurface_d3d_p.h (deleted)
-
include/QtGui/private/qwindowsurface_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwindowsurface_qws_p.h )
-
include/QtGui/private/qwindowsurface_s60_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwindowsurface_s60_p.h )
-
include/QtGui/private/qwindowsystem_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwindowsystem_p.h )
-
include/QtGui/private/qwinnativepangesturerecognizer_win_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwinnativepangesturerecognizer_win_p.h )
-
include/QtGui/private/qwscommand_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwscommand_qws_p.h )
-
include/QtGui/private/qwsdisplay_qws_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwsdisplay_qws_p.h )
-
include/QtGui/private/qwslock_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwslock_p.h )
-
include/QtGui/private/qwsmanager_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwsmanager_p.h )
-
include/QtGui/private/qwssharedmemory_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwssharedmemory_p.h )
-
include/QtGui/private/qwssignalhandler_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtGui/private/qwssignalhandler_p.h )
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
Note:
See TracChangeset
for help on using the changeset viewer.
