AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c3da77798b
qt5base-lts/examples/graphicsview/chip
History
Samuel Rødal 2371147354 Merge remote branch 'gerrit/master' into refactor 
Conflicts:
	src/gui/image/qicon.cpp
	src/gui/image/qicon.h
	src/gui/image/qicon_p.h
	src/gui/text/qfontdatabase.cpp
	src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
	src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
	sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
2011-07-12 12:52:22 +02:00
..
chip.cpp Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
chip.h Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
chip.pro Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
fileprint.png Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
images.qrc Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
main.cpp Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
mainwindow.cpp Merge remote branch 'gerrit/master' into refactor 2011-07-12 12:52:22 +02:00
mainwindow.h Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
qt4logo.png Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
rotateleft.png Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
rotateright.png Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
view.cpp Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
view.h Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
zoomin.png Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
zoomout.png Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00