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 'qt/master' into file-engine-refactor	João Abecasis	2010-11-23	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
\| *	Align .pro with qmake: s/\.sources/.files/.	Miikka Heikkinen	2010-10-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* \|	Fix deployment for examples and tests	Shane Kearns	2010-10-12	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \|	Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
*	Merge commit 'qt/4.7' into 4.7	Miikka Heikkinen	2010-05-17	1	-4/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/benchmarks/declarative/binding/binding.pro tests/benchmarks/declarative/creation/creation.pro tests/benchmarks/declarative/creation/tst_creation.cpp tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
\| *	Symbian build fix to declarative auto and benchmark tests	Joona Petrell	2010-05-14	1	-4/+6
\|/ \| \| \| \|	Task-number: QTBUG-9491 Reviewed-by: Martin Jones
*	Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵	Warwick Allison	2010-02-24	1	-0/+16
	QDeclarativeXXX.