Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Olivier Goffart	2010-05-17	1	-5/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
\| *	define qtPrepareTool() function and use it throughout	Oswald Buddenhagen	2010-05-14	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60	axis	2010-03-16	1	-0/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
\| *	fix qm file installation from shadow build	Oswald Buddenhagen	2010-03-09	1	-0/+1
\| \|
* \|	Implemented recursive "sis" target and enabled sis_targets feature.	axis	2010-02-23	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
* \|	Make the symbian build not bail out over missing files	Thomas Zander	2010-02-10	1	-0/+1
\|/
*	another attempt at fixing the translations build	Oswald Buddenhagen	2010-01-19	1	-2/+6
\| \| \| \|	make qmake generate proper dependencies on lrelease in vcproj/sln files
*	fix qm generation under windows	Oswald Buddenhagen	2010-01-14	1	-1/+1
\| \| \| \|	Reviewed-by: Daniel Molkentin
*	another shot at fixing directory separators in build commands	Oswald Buddenhagen	2009-11-25	1	-1/+1
\|
*	fix mingw build when sh is in $PATH	Oswald Buddenhagen	2009-11-16	1	-1/+1
\|
*	make qm file creation a regular build step	Oswald Buddenhagen	2009-11-10	1	-0/+42
	this is mostly a revert of the revert of the previous attempt, only that this time we have a bootstrapped lrelease which won't blow up for cross-compilations. Reviewed-By: Jason McDonald Task-Id: QTBUG-4939