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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated BSD licensed file headers	Jani Heikkinen	2015-02-15	41	-123/+123
\| \| \| \| \|	Change-Id: I6441ff931dbd33b698d762e6f6784898f3f60fe7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
*	Update copyright headers	Jani Heikkinen	2015-02-11	51	-265/+265
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
*	Merge remote-tracking branch 'origin/5.4' into dev	Frederik Gladhorn	2015-01-21	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
\| *	Doc: Fix typos	Sze Howe Koh	2015-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Change-Id: I29d5576902a5d1ea25558e980081952d9157f7f0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* \|	Haiku: Make examples compile on Haiku	Tobias Koenig	2015-01-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I469619b5d749be1043e0bc43e9199a39ace61f16 Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* \|	QNX: Enable QSharedMemory and QSystemSemaphore support.	Rafael Roquetto	2015-01-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit 96995db4af6e1f5e9fe313 implements the necessary bits for this to work under QNX. Change-Id: Ie9e2f421f4f27fcaf40697dd363e9ed047754f0d Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* \|	Merge remote-tracking branch 'origin/5.4' into dev	Frederik Gladhorn	2014-10-20	1	-1/+2
\|/ \| \| \|	Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb
*	Move Qt Core examples under a common subdirectory	Topi Reinio	2014-10-17	85	-0/+5557
	Qt Core examples were scattered into several subdirectories under qtbase/examples. This caused an issue with the example manifest file generated by QDoc; it expects to find all examples under a common directory in order to produde correct paths to the example .pro files. Qt Creator will not find the examples without a valid manifest file. This change moves the examples and edits the documentation files accordingly. Task-number: QTBUG-41963 Change-Id: I51d86782e0ba21c5c9bae5f15401ec774abe5cf8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>