qt5base-lts/examples/mainwindows/macmainwindow
Lars Knoll 314fdbce8c 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
2011-07-06 14:08:02 +02:00
..
macmainwindow.h Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
macmainwindow.mm Move all other demos in qtbase to examples. 2011-06-24 16:47:24 +02:00
macmainwindow.pro Merge remote branch 'gerrit/master' into refactor 2011-07-06 14:08:02 +02:00
main.cpp Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00