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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'staging/master' into refactor	Samuel Rødal	2011-05-11	2	-0/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
\| *	Fix namespace issue with the global static	mae	2011-05-10	1	-2/+2
\| \| \| \| \| \| \| \|	(cherry picked from commit c99be6bf73dce10fc706764b72a8dacc1c6589a0)
\| *	Fix regression with QSettings patch	mae	2011-05-10	2	-12/+11
\| \| \| \| \| \| \| \| \| \| \| \|	The plugin loader is used without QCoreApplication. This fixes 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5 (cherry picked from commit 988871dabf3c949ffc71d126131281a3ae641ebf)
\| *	Reduce open and stat system calls for QSettings	mae	2011-05-10	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The patch moves the global static QSettings object from QLibrary to QCoreApplication and reduces a few stat and open calls. Without the patch, a large Trolltech.conf was pushed out of the unused settings cache during startup, meaning Trolltech.conf was parsed more than once. Reviewed-by: Liang Qi (cherry picked from commit 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5)
* \|	split up qguivariant into two files	Lars Knoll	2011-05-06	3	-44/+61
\| \| \| \| \| \| \| \| \| \| \| \|	Move everything that will end up in QtWidgets into a qwidgetsvariant.cpp file. Currently this is QIcon and QSizePolicy only.
* \|	Merge remote branch 'origin/master' into refactor	Lars Knoll	2011-05-04	3	-6/+15
\|\\|
\| *	Initial import from qtquick2.	Qt by Nokia	2011-04-27	3	-6/+15
\| \| \| \| \| \| \| \| \| \|	Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* \|	remove the graphicssystem code paths.	Lars Knoll	2011-05-03	1	-1/+0
\| \| \| \| \| \| \| \| \| \|	QPA's platform integration layer replaces the graphics system now.
* \|	Proper child delivery of mouse and key events.	Samuel Rødal	2011-05-02	1	-0/+1
\| \|
* \|	QGuiApplication refactor in progress.	Samuel Rødal	2011-04-28	2	-27/+3
\| \| \| \| \| \| \| \| \| \|	Things are a bit broken now... At least wiggly runs :) (cherry picked from commit 6cdcf395ffe1e051d109a45ecd71141173a4a4c0)
* \|	Add isWindow type to QObject	Jørgen Lind	2011-04-28	2	-1/+4
\|/ \| \| \|	(cherry picked from commit 77f08730b4cdb23b43471b2b29ece59e159103d7)
*	Initial import from the monolithic Qt.	Qt by Nokia	2011-04-27	91	-0/+42591
	This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12