review.tizen.org Git - profile/ivi/qtbase.git/commit

projects / profile / ivi / qtbase.git / commit

author	Lars Knoll <lars.knoll@nokia.com>
	Wed, 6 Jul 2011 11:55:40 +0000 (13:55 +0200)
committer	Lars Knoll <lars.knoll@nokia.com>
	Wed, 6 Jul 2011 12:08:02 +0000 (14:08 +0200)
commit	314fdbce8ce473eb3610be3658c61fab2fac0efb
tree	98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863	tree \| snapshot
parent	8d7647e286e07690de15a6ff9189307ee1a3517c	commit \| diff
parent	83736a8d06a6ca2a1f165d6119ddaca90646e1f8	commit \| diff

Merge remote branch 'gerrit/master' into refactor

Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234

76 files changed:

configure	diff1 \|	diff2 \|	blob \| history
examples/itemviews/interview/interview.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/itemviews.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/spreadsheet/spreadsheet.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/macmainwindow/macmainwindow.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/mainwindow/mainwindow.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/mainwindows.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/affine/affine.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/composition/composition.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/deform/deform.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/gradients/gradients.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/painting.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/pathstroke/pathstroke.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/shared/shared.pro	diff1 \|	diff2 \|	blob \| history
examples/richtext/richtext.pro	diff1 \|	diff2 \|	blob \| history
examples/richtext/textedit/textedit.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/tools.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/undo/undo.pro	diff1 \|	diff2 \|	blob \| history
mkspecs/modules/qt_core.pri	\|	\|	blob
mkspecs/modules/qt_dbus.pri	\|	\|	blob
mkspecs/modules/qt_gui.pri	\|	\|	blob
mkspecs/modules/qt_network.pri	\|	\|	blob
mkspecs/modules/qt_opengl.pri	\|	\|	blob
mkspecs/modules/qt_platformsupport.pri	\|	\|	blob
mkspecs/modules/qt_sql.pri	\|	\|	blob
mkspecs/modules/qt_testlib.pri	\|	\|	blob
mkspecs/modules/qt_uilib.pri	\|	\|	blob
mkspecs/modules/qt_uitools.pri	\|	\|	blob
mkspecs/modules/qt_widgets.pri	\|	\|	blob
mkspecs/modules/qt_xml.pri	\|	\|	blob
mkspecs/qmodule.pri	\|	\|	blob
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qnamespace.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdir.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreevent.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreevent.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetatype.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbrush.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qmatrix.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qstatictext.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qpaintengine_opengl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylanddisplay.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylandinputdevice.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylandwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/graphicsview/qgraphicsproxywidget.cpp	diff1 \|	\|	blob \| history
src/widgets/kernel/qapplication.cpp	diff1 \|	\|	blob \| history
src/widgets/platforms/mac/qfontdatabase_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qpaintengine_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/win/qprintengine_win.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qfontdatabase_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qpaintengine_x11.cpp	diff1 \|	\|	blob \| history
src/widgets/widgets/qmaccocoaviewcontainer_mac.mm	diff1 \|	diff2 \|	blob \| history
tests/auto/qclipboard/tst_qclipboard.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicsview/tst_qgraphicsview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qlistview/tst_qlistview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qstatictext/tst_qstatictext.cpp	diff1 \|	diff2 \|	blob \| history
tools/configure/configureapp.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom

configure	diff1 \|	diff2 \|	blob \| history
examples/itemviews/interview/interview.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/itemviews.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/spreadsheet/spreadsheet.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/macmainwindow/macmainwindow.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/mainwindow/mainwindow.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/mainwindows.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/affine/affine.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/composition/composition.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/deform/deform.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/gradients/gradients.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/painting.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/pathstroke/pathstroke.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/shared/shared.pro	diff1 \|	diff2 \|	blob \| history
examples/richtext/richtext.pro	diff1 \|	diff2 \|	blob \| history
examples/richtext/textedit/textedit.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/tools.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/undo/undo.pro	diff1 \|	diff2 \|	blob \| history
mkspecs/modules/qt_core.pri	\|	\|	blob
mkspecs/modules/qt_dbus.pri	\|	\|	blob
mkspecs/modules/qt_gui.pri	\|	\|	blob
mkspecs/modules/qt_network.pri	\|	\|	blob
mkspecs/modules/qt_opengl.pri	\|	\|	blob
mkspecs/modules/qt_platformsupport.pri	\|	\|	blob
mkspecs/modules/qt_sql.pri	\|	\|	blob
mkspecs/modules/qt_testlib.pri	\|	\|	blob
mkspecs/modules/qt_uilib.pri	\|	\|	blob
mkspecs/modules/qt_uitools.pri	\|	\|	blob
mkspecs/modules/qt_widgets.pri	\|	\|	blob
mkspecs/modules/qt_xml.pri	\|	\|	blob
mkspecs/qmodule.pri	\|	\|	blob
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qnamespace.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdir.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreevent.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreevent.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetatype.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbrush.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qmatrix.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qstatictext.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qpaintengine_opengl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylanddisplay.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylandinputdevice.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylandwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/graphicsview/qgraphicsproxywidget.cpp	diff1 \|	\|	blob \| history
src/widgets/kernel/qapplication.cpp	diff1 \|	\|	blob \| history
src/widgets/platforms/mac/qfontdatabase_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qpaintengine_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/win/qprintengine_win.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qfontdatabase_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qpaintengine_x11.cpp	diff1 \|	\|	blob \| history
src/widgets/widgets/qmaccocoaviewcontainer_mac.mm	diff1 \|	diff2 \|	blob \| history
tests/auto/qclipboard/tst_qclipboard.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicsview/tst_qgraphicsview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qlistview/tst_qlistview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qstatictext/tst_qstatictext.cpp	diff1 \|	diff2 \|	blob \| history
tools/configure/configureapp.cpp	diff1 \|	diff2 \|	blob \| history