Changeset 769 for trunk/src/gui
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 223 edited
- 3 copied
-
. (modified) (view diffs)
-
src/gui/dialogs/qcolordialog.cpp (modified) (view diffs)
-
src/gui/dialogs/qcolordialog_mac.mm (modified) (view diffs)
-
src/gui/dialogs/qdialog.cpp (modified) (view diffs)
-
src/gui/dialogs/qfiledialog.cpp (modified) (view diffs)
-
src/gui/dialogs/qfiledialog.ui (modified) (view diffs)
-
src/gui/dialogs/qfilesystemmodel.cpp (modified) (view diffs)
-
src/gui/dialogs/qfontdialog.cpp (modified) (view diffs)
-
src/gui/dialogs/qfontdialog.h (modified) (view diffs)
-
src/gui/dialogs/qfontdialog_mac.mm (modified) (view diffs)
-
src/gui/dialogs/qfontdialog_p.h (modified) (view diffs)
-
src/gui/dialogs/qmessagebox.cpp (modified) (view diffs)
-
src/gui/dialogs/qprintdialog.h (modified) (view diffs)
-
src/gui/dialogs/qprintdialog_unix.cpp (modified) (view diffs)
-
src/gui/dialogs/qprintpreviewdialog.cpp (modified) (view diffs)
-
src/gui/effects/qgraphicseffect.cpp (modified) (view diffs)
-
src/gui/egl/egl.pri (modified) (view diffs)
-
src/gui/egl/qegl.cpp (modified) (view diffs)
-
src/gui/egl/qegl_p.h (modified) (view diffs)
-
src/gui/egl/qegl_qws.cpp (modified) (view diffs)
-
src/gui/egl/qegl_stub.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/gui/egl/qegl_stub.cpp ) (view diffs)
-
src/gui/egl/qegl_symbian.cpp (modified) (view diffs)
-
src/gui/egl/qegl_wince.cpp (modified) (view diffs)
-
src/gui/egl/qegl_x11.cpp (modified) (view diffs)
-
src/gui/egl/qeglproperties.cpp (modified) (view diffs)
-
src/gui/egl/qeglproperties_p.h (modified) (view diffs)
-
src/gui/egl/qeglproperties_stub.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/gui/egl/qeglproperties_stub.cpp ) (view diffs)
-
src/gui/embedded/directfb.pri (modified) (view diffs)
-
src/gui/embedded/qscreen_qws.cpp (modified) (view diffs)
-
src/gui/embedded/qscreenqnx_qws.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsitem.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsitem_p.h (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsproxywidget.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsproxywidget_p.h (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsscene.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsscene_p.h (modified) (view diffs)
-
src/gui/graphicsview/qgraphicssceneevent.h (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsview.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicsview_p.h (modified) (view diffs)
-
src/gui/graphicsview/qgraphicswidget.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicswidget_p.cpp (modified) (view diffs)
-
src/gui/graphicsview/qgraphicswidget_p.h (modified) (view diffs)
-
src/gui/gui.pro (modified) (view diffs)
-
src/gui/image/qicon.cpp (modified) (view diffs)
-
src/gui/image/qiconloader.cpp (modified) (view diffs)
-
src/gui/image/qiconloader_p.h (modified) (view diffs)
-
src/gui/image/qimage.cpp (modified) (view diffs)
-
src/gui/image/qimagepixmapcleanuphooks.cpp (modified) (view diffs)
-
src/gui/image/qimagepixmapcleanuphooks_p.h (modified) (view diffs)
-
src/gui/image/qimagereader.cpp (modified) (view diffs)
-
src/gui/image/qimagewriter.cpp (modified) (view diffs)
-
src/gui/image/qnativeimage.cpp (modified) (view diffs)
-
src/gui/image/qpaintengine_pic.cpp (modified) (view diffs)
-
src/gui/image/qpicture.cpp (modified) (view diffs)
-
src/gui/image/qpixmap.cpp (modified) (view diffs)
-
src/gui/image/qpixmap_raster.cpp (modified) (view diffs)
-
src/gui/image/qpixmap_s60.cpp (modified) (view diffs)
-
src/gui/image/qpixmap_x11.cpp (modified) (view diffs)
-
src/gui/image/qpixmapfilter.cpp (modified) (view diffs)
-
src/gui/inputmethod/inputmethod.pri (modified) (view diffs)
-
src/gui/inputmethod/qcoefepinputcontext_p.h (modified) (view diffs)
-
src/gui/inputmethod/qcoefepinputcontext_s60.cpp (modified) (view diffs)
-
src/gui/inputmethod/qinputcontextfactory.cpp (modified) (view diffs)
-
src/gui/itemviews/qabstractitemview.cpp (modified) (view diffs)
-
src/gui/itemviews/qabstractproxymodel.cpp (modified) (view diffs)
-
src/gui/itemviews/qfileiconprovider.cpp (modified) (view diffs)
-
src/gui/itemviews/qitemdelegate.cpp (modified) (view diffs)
-
src/gui/itemviews/qlistview.cpp (modified) (view diffs)
-
src/gui/itemviews/qstyleditemdelegate.cpp (modified) (view diffs)
-
src/gui/itemviews/qtableview.cpp (modified) (view diffs)
-
src/gui/itemviews/qtreeview.cpp (modified) (view diffs)
-
src/gui/kernel/qapplication.cpp (modified) (view diffs)
-
src/gui/kernel/qapplication_mac.mm (modified) (view diffs)
-
src/gui/kernel/qapplication_p.h (modified) (view diffs)
-
src/gui/kernel/qapplication_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qapplication_win.cpp (modified) (view diffs)
-
src/gui/kernel/qapplication_x11.cpp (modified) (view diffs)
-
src/gui/kernel/qclipboard_mac.cpp (modified) (view diffs)
-
src/gui/kernel/qclipboard_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qcocoamenuloader_mac.mm (modified) (view diffs)
-
src/gui/kernel/qcocoamenuloader_mac_p.h (modified) (view diffs)
-
src/gui/kernel/qcocoapanel_mac.mm (modified) (view diffs)
-
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h (modified) (view diffs)
-
src/gui/kernel/qcocoaview_mac.mm (modified) (view diffs)
-
src/gui/kernel/qcocoawindow_mac_p.h (modified) (view diffs)
-
src/gui/kernel/qcursor.cpp (modified) (view diffs)
-
src/gui/kernel/qdesktopwidget_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qdnd_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qdnd_x11.cpp (modified) (view diffs)
-
src/gui/kernel/qeventdispatcher_mac.mm (modified) (view diffs)
-
src/gui/kernel/qgesturemanager.cpp (modified) (view diffs)
-
src/gui/kernel/qgridlayout.cpp (modified) (view diffs)
-
src/gui/kernel/qguifunctions_wince.cpp (modified) (view diffs)
-
src/gui/kernel/qkeymapper_p.h (modified) (view diffs)
-
src/gui/kernel/qkeymapper_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qkeymapper_x11.cpp (modified) (view diffs)
-
src/gui/kernel/qmime_mac.cpp (modified) (view diffs)
-
src/gui/kernel/qmime_win.cpp (modified) (view diffs)
-
src/gui/kernel/qsoftkeymanager.cpp (modified) (view diffs)
-
src/gui/kernel/qsoftkeymanager_common_p.h (modified) (view diffs)
-
src/gui/kernel/qsoftkeymanager_p.h (modified) (view diffs)
-
src/gui/kernel/qsoftkeymanager_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qsoftkeymanager_s60_p.h (modified) (view diffs)
-
src/gui/kernel/qsound.cpp (modified) (view diffs)
-
src/gui/kernel/qsound_mac.mm (modified) (view diffs)
-
src/gui/kernel/qsound_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qt_cocoa_helpers_mac.mm (modified) (view diffs)
-
src/gui/kernel/qt_s60_p.h (modified) (view diffs)
-
src/gui/kernel/qt_x11_p.h (modified) (view diffs)
-
src/gui/kernel/qtooltip.cpp (modified) (view diffs)
-
src/gui/kernel/qwhatsthis.cpp (modified) (view diffs)
-
src/gui/kernel/qwidget.cpp (modified) (view diffs)
-
src/gui/kernel/qwidget_mac.mm (modified) (view diffs)
-
src/gui/kernel/qwidget_p.h (modified) (view diffs)
-
src/gui/kernel/qwidget_s60.cpp (modified) (view diffs)
-
src/gui/kernel/qwidget_win.cpp (modified) (view diffs)
-
src/gui/kernel/qwidget_x11.cpp (modified) (view diffs)
-
src/gui/kernel/qwinnativepangesturerecognizer_win_p.h (modified) (view diffs)
-
src/gui/painting/qbackingstore.cpp (modified) (view diffs)
-
src/gui/painting/qbrush.cpp (modified) (view diffs)
-
src/gui/painting/qcups.cpp (modified) (view diffs)
-
src/gui/painting/qdrawhelper.cpp (modified) (view diffs)
-
src/gui/painting/qdrawhelper_mmx_p.h (modified) (view diffs)
-
src/gui/painting/qdrawhelper_neon.cpp (modified) (view diffs)
-
src/gui/painting/qdrawhelper_p.h (modified) (view diffs)
-
src/gui/painting/qdrawhelper_sse2.cpp (modified) (view diffs)
-
src/gui/painting/qdrawhelper_x86_p.h (modified) (view diffs)
-
src/gui/painting/qdrawutil.cpp (modified) (view diffs)
-
src/gui/painting/qgraphicssystem_raster.cpp (modified) (view diffs)
-
src/gui/painting/qmath_p.h (modified) (view diffs)
-
src/gui/painting/qpaintbuffer.cpp (modified) (view diffs)
-
src/gui/painting/qpaintengine_alpha.cpp (modified) (view diffs)
-
src/gui/painting/qpaintengine_raster.cpp (modified) (view diffs)
-
src/gui/painting/qpaintengine_x11.cpp (modified) (view diffs)
-
src/gui/painting/qpaintengineex.cpp (modified) (view diffs)
-
src/gui/painting/qpainter.cpp (modified) (view diffs)
-
src/gui/painting/qpathclipper.cpp (modified) (view diffs)
-
src/gui/painting/qpdf.cpp (modified) (view diffs)
-
src/gui/painting/qprintengine_ps.cpp (modified) (view diffs)
-
src/gui/painting/qprintengine_win.cpp (modified) (view diffs)
-
src/gui/painting/qregion.cpp (modified) (view diffs)
-
src/gui/painting/qstroker.cpp (modified) (view diffs)
-
src/gui/painting/qtransform.h (modified) (view diffs)
-
src/gui/painting/qwindowsurface_qws.cpp (modified) (view diffs)
-
src/gui/painting/qwindowsurface_qws_p.h (modified) (view diffs)
-
src/gui/painting/qwindowsurface_raster.cpp (modified) (view diffs)
-
src/gui/painting/qwindowsurface_s60.cpp (modified) (view diffs)
-
src/gui/s60framework/qs60mainapplication.cpp (modified) (view diffs)
-
src/gui/s60framework/qs60mainappui.cpp (modified) (view diffs)
-
src/gui/s60framework/qs60maindocument.h (modified) (view diffs)
-
src/gui/s60framework/s60framework.pri (modified) (view diffs)
-
src/gui/styles/qcommonstyle.cpp (modified) (view diffs)
-
src/gui/styles/qgtkstyle.cpp (modified) (view diffs)
-
src/gui/styles/qgtkstyle_p.cpp (modified) (view diffs)
-
src/gui/styles/qgtkstyle_p.h (modified) (view diffs)
-
src/gui/styles/qmacstyle_mac.mm (modified) (view diffs)
-
src/gui/styles/qs60style.cpp (modified) (view diffs)
-
src/gui/styles/qs60style.h (modified) (view diffs)
-
src/gui/styles/qs60style_p.h (modified) (view diffs)
-
src/gui/styles/qs60style_s60.cpp (modified) (view diffs)
-
src/gui/styles/qstylesheetstyle.cpp (modified) (view diffs)
-
src/gui/styles/qstylesheetstyle_p.h (modified) (view diffs)
-
src/gui/styles/qwindowsmobilestyle.cpp (modified) (view diffs)
-
src/gui/styles/styles.pri (modified) (view diffs)
-
src/gui/text/qcssparser.cpp (modified) (view diffs)
-
src/gui/text/qfont.cpp (modified) (view diffs)
-
src/gui/text/qfontdatabase.cpp (modified) (view diffs)
-
src/gui/text/qfontdatabase_s60.cpp (modified) (view diffs)
-
src/gui/text/qfontdatabase_win.cpp (modified) (view diffs)
-
src/gui/text/qfontengine.cpp (modified) (view diffs)
-
src/gui/text/qfontengine_p.h (modified) (view diffs)
-
src/gui/text/qfontengine_s60.cpp (modified) (view diffs)
-
src/gui/text/qfontengine_s60_p.h (modified) (view diffs)
-
src/gui/text/qfontengine_win.cpp (modified) (view diffs)
-
src/gui/text/qfontengine_win_p.h (modified) (view diffs)
-
src/gui/text/qfontmetrics.cpp (modified) (view diffs)
-
src/gui/text/qtextcontrol.cpp (modified) (view diffs)
-
src/gui/text/qtextdocument.cpp (modified) (view diffs)
-
src/gui/text/qtextdocumentlayout.cpp (modified) (view diffs)
-
src/gui/text/qtextengine.cpp (modified) (view diffs)
-
src/gui/text/qtextengine_p.h (modified) (view diffs)
-
src/gui/text/qtextformat.cpp (modified) (view diffs)
-
src/gui/text/qtextimagehandler.cpp (modified) (view diffs)
-
src/gui/text/qtextlayout.cpp (modified) (view diffs)
-
src/gui/text/qzip.cpp (modified) (view diffs)
-
src/gui/text/qzipreader_p.h (modified) (view diffs)
-
src/gui/text/qzipwriter_p.h (modified) (view diffs)
-
src/gui/util/qcompleter.cpp (modified) (view diffs)
-
src/gui/util/qdesktopservices_s60.cpp (modified) (view diffs)
-
src/gui/util/qsystemtrayicon_mac.mm (modified) (view diffs)
-
src/gui/util/qsystemtrayicon_p.h (modified) (view diffs)
-
src/gui/util/qsystemtrayicon_win.cpp (modified) (view diffs)
-
src/gui/util/qsystemtrayicon_wince.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/gui/util/qsystemtrayicon_wince.cpp ) (view diffs)
-
src/gui/util/qsystemtrayicon_x11.cpp (modified) (view diffs)
-
src/gui/util/util.pri (modified) (view diffs)
-
src/gui/widgets/qabstractbutton.cpp (modified) (view diffs)
-
src/gui/widgets/qabstractscrollarea.cpp (modified) (view diffs)
-
src/gui/widgets/qabstractslider.cpp (modified) (view diffs)
-
src/gui/widgets/qabstractslider_p.h (modified) (view diffs)
-
src/gui/widgets/qabstractspinbox.h (modified) (view diffs)
-
src/gui/widgets/qcombobox.cpp (modified) (view diffs)
-
src/gui/widgets/qcombobox.h (modified) (view diffs)
-
src/gui/widgets/qcombobox_p.h (modified) (view diffs)
-
src/gui/widgets/qdialogbuttonbox.cpp (modified) (view diffs)
-
src/gui/widgets/qdockarealayout.cpp (modified) (view diffs)
-
src/gui/widgets/qlinecontrol.cpp (modified) (view diffs)
-
src/gui/widgets/qlinecontrol_p.h (modified) (view diffs)
-
src/gui/widgets/qlineedit.cpp (modified) (view diffs)
-
src/gui/widgets/qlineedit_p.cpp (modified) (view diffs)
-
src/gui/widgets/qmainwindow.cpp (modified) (view diffs)
-
src/gui/widgets/qmainwindowlayout.cpp (modified) (view diffs)
-
src/gui/widgets/qmainwindowlayout_mac.mm (modified) (view diffs)
-
src/gui/widgets/qmenu.cpp (modified) (view diffs)
-
src/gui/widgets/qmenu.h (modified) (view diffs)
-
src/gui/widgets/qmenu_mac.mm (modified) (view diffs)
-
src/gui/widgets/qmenu_p.h (modified) (view diffs)
-
src/gui/widgets/qmenu_symbian.cpp (modified) (view diffs)
-
src/gui/widgets/qmenu_wince.cpp (modified) (view diffs)
-
src/gui/widgets/qmenubar.cpp (modified) (view diffs)
-
src/gui/widgets/qmenubar.h (modified) (view diffs)
-
src/gui/widgets/qmenubar_p.h (modified) (view diffs)
-
src/gui/widgets/qprintpreviewwidget.cpp (modified) (view diffs)
-
src/gui/widgets/qscrollbar.cpp (modified) (view diffs)
-
src/gui/widgets/qspinbox.cpp (modified) (view diffs)
-
src/gui/widgets/qtabbar.cpp (modified) (view diffs)
-
src/gui/widgets/qtoolbar.cpp (modified) (view diffs)
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
