AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7b3b6b5afa
qt5base-lts/examples/animation/stickman
History
Samuel Rødal 7b3b6b5afa 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
2011-07-21 14:42:46 +02:00
..
animations Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
animation.cpp Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
animation.h Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
graphicsview.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
graphicsview.h Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
lifecycle.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
lifecycle.h Squashed commit of the changes from the mobile-examples repository 2011-05-23 14:24:07 +02:00
main.cpp Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
node.cpp Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
node.h Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
rectbutton.cpp Doc: Added missing license headers for documentation and examples. 2011-07-20 15:12:53 +02:00
rectbutton.h Doc: Added missing license headers for documentation and examples. 2011-07-20 15:12:53 +02:00
stickman.cpp Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
stickman.desktop Squashed commit of changes from the 4.8-temp branch. 2011-05-23 14:24:07 +02:00
stickman.h Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
stickman.pro Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
stickman.qrc Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00