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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-03-11	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
\| *	Moved qdeclarativemodules to imports	mae	2010-03-02	1	-1/+0
\| \|
* \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-03-01	1	-2/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
\| *	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt	Warwick Allison	2010-02-24	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
\| \| *	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-22	1	-1/+4
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/network/access/qnetworkaccessmanager.cpp
\| \| * \|	Convert generic engine into a plugin.	Aaron McCarthy	2009-12-22	1	-1/+1
\| \| \| \|
\| * \| \|	Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵	Warwick Allison	2010-02-24	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \|	QDeclarativeXXX.
* \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-02-23	1	-1/+4
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
\| * \|	Use the qmlmodule method for adding multimedia qml elements.	Justin McPherson	2010-02-19	1	-0/+2
\| \| \|
\| * \|	Move QtMobility multimedia framework into Qt.	Justin McPherson	2010-01-15	1	-1/+2
\| \| \|
* \| \|	Fix symbian building to always have a pre-determined uid3	Thomas Zander	2010-01-19	1	-1/+2
\| \|/ \|/\| \| \| \| \| \| \|	For all Qt libs we use hardcoded uid3s, so these plugins should have them too.
* \|	Commit patch by Gareth.	Frans Englich	2009-08-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did.
* \|	Merge branch 'master' into topic/mmfphonon	Frans Englich	2009-08-12	1	-0/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro
\| *	Merge commit 'qt/master-stable'	Jason Barron	2009-08-06	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
\| \| *	Merge AudioServices into mainline.	Justin McPherson	2009-08-05	1	-0/+1
\| \| \|
\| \| *	Long live Qt!	Lars Knoll	2009-03-23	1	-0/+12
\| \|
* \|	Merge commit 'origin/master' into topic/mmfphonon	Frans Englich	2009-07-21	1	-3/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: src/plugins/plugins.pro src/s60installs/qt.iby
\| *	Fix plugins properly.	Jason Barron	2009-07-10	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	The 'else' block is not the correct place to add the s60 subdir because this will also build the plugin for other non-unix platforms which is not correct. It should be built on symbian.
\| *	someone forgot this import module: s60	Liang Qi	2009-07-10	1	-1/+1
\| \|
\| *	Tweak deployment rules after addition of OpenVG.	Jason Barron	2009-07-09	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that we build the plugins we need and also clean up the file a bit to remove the symbian specific blocks that aren't needed. Also we no longer need a separate .iby file for deploying the VG graphics system since it is now nicely integrated into Qt.
* \|	Include Phonon plugins for Symbian.	Frans Englich	2009-07-21	1	-1/+1
\|/
*	Long live Qt for S60!	axis	2009-04-24	1	-0/+13