qt/qtbase.git - Qt Base (Core, Gui, Widgets, Network, ...)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Reimplement GLTexture::failed() properly in GLRenderTargetCube	Bradley T. Hughes	2011-10-31	1	-1/+1
\| \| \| \| \| \| \| \|	The GLRenderTargetCube::failed() method needs to be const. Change-Id: I9bfa031e284b62c86a9be786aea3b851582b71f4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
*	Merge remote-tracking branch 'base/master' into refactor	Jørgen Lind	2011-06-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
*	Move all other demos in qtbase to examples.	Casper van Donderen	2011-06-24	1	-0/+366
	Change-Id: Iab0e7364d1f6b348d0e3033ea9304139f5bd6d0d Reviewed-on: http://codereview.qt.nokia.com/617 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie