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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.5' into dev	Frederik Gladhorn	2015-08-06	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
\| *	Doc:added doc to undocumented functions	Nico Vertriest	2015-07-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-36985 Change-Id: Ic358682b276d67ef804f727bcf14191718613469 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* \|	Merge remote-tracking branch 'origin/5.5' into dev	Simon Hausmann	2015-06-03	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
\| *	Doc: Fix spelling errors in the QXcbWindowFunctions docs	Alexander Volkov	2015-05-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Change-Id: I0fe7dab6e80876b0fd17f59559295feecfd8cf63 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* \|	doc: Add missing documentation for QXcbWindowFunctions	Martin Smith	2015-04-30	1	-4/+131
\|/ \| \| \| \| \| \| \|	This update adds documentation for member functions of QXcbWindowFunctions. Change-Id: I358ac502c5dc180a92d6157d3972a44baeebf2c0 Task-number: QTBUG-45756 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
*	Update copyright headers	Jani Heikkinen	2015-02-11	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
*	Update platformheaders docs about bc.	Laszlo Agocs	2014-07-08	1	-0/+4
\| \| \| \| \| \| \| \|	Remove the "As of Qt 5.4" to avoid misunderstandings. Also add the note for the classes that miss it. Change-Id: Id7f437954bb3ec12c0fc944c18e58e6e977863f1 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
*	Use QtPlatformHeaders to set platform specific functionality	Jorgen Lind	2014-05-09	1	-0/+79
	This involves exposing a new function in the QPlatformNativeInterface which gets a public function for QGuiApplication Proof of concept is done through implementing _NET_WM_WINDOW_TYPE setters for xcb Change-Id: Ic9544e775fb71cc9b30273595ec41b1cdb1c9d64 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>