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

Merge remote branch 'gerrit/master' into refactor

Conflicts:
examples/opengl/cube/main.cpp
examples/widgets/applicationicon/main.cpp
examples/widgets/orientation/main.cpp
src/gui/image/qicon.cpp
src/gui/image/qimage.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_mac.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qpalette.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qslider.cpp
src/opengl/qwindowsurface_gl.cpp
tests/auto/qvariant/qvariant.pro
tests/benchmarks/corelib/kernel/qobject/qobject.pro
tests/benchmarks/gui/animation/qanimation/qanimation.pro
tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
tests/benchmarks/gui/kernel/qapplication/qapplication.pro
tests/benchmarks/gui/kernel/qwidget/qwidget.pro
tests/benchmarks/gui/painting/qpainter/qpainter.pro
tests/benchmarks/gui/painting/qtbench/qtbench.pro
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
tests/benchmarks/gui/text/qtext/qtext.pro

Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30

author	Samuel Rødal <samuel.rodal@nokia.com>
	Thu, 21 Jul 2011 12:42:46 +0000 (14:42 +0200)
committer	Samuel Rødal <samuel.rodal@nokia.com>
	Thu, 21 Jul 2011 12:42:46 +0000 (14:42 +0200)
commit	7b3b6b5afaaf1db1bfbfa9b56fa7b955a61344bd
tree	8be0d601853d021434e03cef9a9cfd64b3708e92	tree \| snapshot
parent	070fc2f694beaa56fc191f1a3f6a1b9812f4ed35	commit \| diff
parent	56defa4725508608a85e2813b85af3a7fcefefa0	commit \| diff

examples/opengl/cube/main.cpp	diff1 \|	diff2 \|	blob \| history
examples/widgets/applicationicon/main.cpp	diff1 \|	diff2 \|	blob \| history
examples/widgets/charactermap/characterwidget.cpp	diff1 \|	diff2 \|	blob \| history
examples/widgets/elidedlabel/elidedlabel.h	diff1 \|	diff2 \|	blob \| history
examples/widgets/elidedlabel/main.cpp	diff1 \|	diff2 \|	blob \| history
examples/widgets/elidedlabel/testwidget.cpp	diff1 \|	diff2 \|	blob \| history
examples/widgets/elidedlabel/testwidget.h	diff1 \|	diff2 \|	blob \| history
examples/widgets/orientation/main.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreevent.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qdatetime.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbrush.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qtriangulator.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/opengl.pro	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qfontdatabase_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qfontengine_coretext.mm	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qcheckbox.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qcombobox.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qsplashscreen.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qsplitter.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/widgets/qtoolbutton.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qapplication/test/test.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qdialog/qdialog.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qfilesystemmodel/qfilesystemmodel.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qfocusevent/qfocusevent.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qgl/qgl.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicstransform/qgraphicstransform.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qgraphicswidget/qgraphicswidget.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qicon/qicon.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qimagereader/qimagereader.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qinputcontext/qinputcontext.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qlayout/qlayout.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qmacstyle/qmacstyle.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qmdisubwindow/qmdisubwindow.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qmessagebox/qmessagebox.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qpainter/qpainter.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qprinter/qprinter.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qscrollbar/qscrollbar.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qtabwidget/qtabwidget.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qtextbrowser/qtextbrowser.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qtoolbutton/qtoolbutton.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qundogroup/qundogroup.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qundostack/qundostack.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qvariant/qvariant.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qwidget/qwidget.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/corelib/kernel/qobject/qobject.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/animation/qanimation/qanimation.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/image/qimagereader/qimagereader.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/itemviews/qtableview/qtableview.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/kernel/qapplication/qapplication.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/kernel/qwidget/qwidget.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/painting/qpainter/qpainter.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/painting/qtbench/qtbench.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro	diff1 \|	diff2 \|	blob \| history
tests/benchmarks/gui/text/qtext/qtext.pro	diff1 \|	diff2 \|	blob \| history