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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix compilation of examples with QStringBuilder	Olivier Goffart	2012-02-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	In sub-attack an interview, one can't make two implicit conversions at once, so explicitly convert to the right type. The change in the torrent example is required because of https://codereview.qt-project.org/16168 (commit 9491272) But in that case, using a QByteArray is better anyway. Change-Id: Ieed22ac7f0d700d5ba5d1e70af3db4dd6c139c8f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	examples: compile w/o opengl	Marc Mutz	2012-02-24	2	-7/+8
\| \| \| \| \| \| \|	Fixes remnants of an automated QtGui -> QtWidgets port. Change-Id: I31f63bdd6ae71aee8e70b20e24def30e0eafb725 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Remove "All rights reserved" line from license headers.	Jason McDonald	2012-01-30	27	-27/+27
\| \| \| \| \| \| \| \| \| \|	As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Remove use of QT_MODULE from library	Gunnar Sletta	2012-01-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \|	These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Update contact information in license headers.	Jason McDonald	2012-01-23	27	-27/+27
\| \| \| \| \| \| \|	Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Update copyright year in license headers.	Jason McDonald	2012-01-05	27	-27/+27
\| \| \| \| \|	Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Merge remote-tracking branch 'base/master' into refactor	Jørgen Lind	2011-06-27	13	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Update sql and animation demos to be an example.	Casper van Donderen	2011-06-24	1	-2/+2
\| \| \| \| \| \| \|	Change-Id: I683383e2dab9428ea3fe4cfffba24bb7fefbc7c7 Reviewed-on: http://codereview.qt.nokia.com/618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
*	Move all other demos in qtbase to examples.	Casper van Donderen	2011-06-24	71	-0/+6215
	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