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	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
\| *	QPA plugins: Use _iid macros instead of strings in Q_PLUGIN_METADATA.	Friedemann Kleint	2015-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to change the version numbers by changing the macros in QtGui. Task-number: QTBUG-46009 Change-Id: I94c9591ec6f7c9173a698df9e1fe8fd6a904caf4 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* \|	Haiku: Fix reported geometry of platform window	Tobias Koenig	2015-05-27	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Report the proper window geometry and adapt the geometry parameters of expose events to be relative to the window coordinate system. Change-Id: Ifb32b2663fdf41df0c9783e76e0ebc5e5cf978a3 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* \|	Haiku: Fix compilation after QPA API change	Tobias Koenig	2015-05-04	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the calls to QWindowSystemInterface::setSynchronousWindowsSystemEvents in the Haiku QPA plugin, because the method was renamed in latest QPA API and we do not really have to call them anyway (was a copy&paste leftover from QNX QPA). Change-Id: I67db43e89c093e5679f11d967d609846008cad0d Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* \|	Haiku: Fix clipboard implementation	Tobias Koenig	2015-03-25	2	-9/+40
\|/ \| \| \| \| \| \| \| \|	Fix the behavior of the clipboard implementation to pass the unit test. Change-Id: Ia8d5428eebf17a626565e8f4a4d895a67f35b20b Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
*	Haiku: Initial version of QPA plugin for Haiku	Tobias Koenig	2015-02-17	28	-0/+2710
	Change-Id: Ib4d1d75a11602af8423970e12c7cc594576e1c4d Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>