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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'refactor'	Gunnar Sletta	2011-09-13	1	-55/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
\| *	Modify mkspecs/unsupported/macx-clang/qplatformdefs.h	Takumi ASAKI	2011-09-12	1	-55/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now mkspecs/unsupported/macx-clang/qplatformdefs.h includes mkspecs/common/mac/qplatformdefs.h. This patch fixes that Qt built with clang failes to load cocoa platform plugin without QT_QPA_PLATFORM environment variable. Change-Id: Id48268eaf7ba24403f91497539ef0dab6f22a9dc Reviewed-on: http://codereview.qt-project.org/4564 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* \|	sync win32-g++-cross with win32-g++ (lib prefix and extension)	Mark Brand	2011-09-12	1	-0/+2
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	qmake now needs library prefix and extension to be supplied. This was added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross. Without this, static libraries get named 'X.lib' instead of 'libX.a'. Merge-request: 1283 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 8ce9dc02cd5031f26c7fec10484a8c47904c46f5) Change-Id: Ic12f655bcfc8a422a98819904ec796d896de77f5 Reviewed-on: http://codereview.qt-project.org/4575 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
*	Update licenseheader text in source files for qtbase Qt module	Jyri Tahtela	2011-05-24	19	-336/+336
\| \| \| \| \| \| \|	Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
*	Initial import from the monolithic Qt.	Qt by Nokia	2011-04-27	40	-0/+2488
	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