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	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Phonon QT7 backend; Don't release string after unsuccessful ↵	Justin McPherson	2010-05-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	AudioDeviceGetProperty(). Reviewed-by:Andrew den Exter
* \|	Phonon qt7; Compile fixes after merge.	Justin McPherson	2010-03-26	5	-12/+21
\| \|
* \|	Phonon; complete integration.	Justin McPherson	2010-03-25	1	-10/+10
\| \|
* \|	Update Phonon qt7 backend to 4.4.0.	Justin McPherson	2010-03-25	10	-574/+137
\|/
*	Changed names and URLs to reflect name change.	axis	2009-08-19	1	-1/+1
\| \| \| \|	RevBy: Trust me
*	Merge commit 'origin/4.5'	Bjørn Erik Nilsen	2009-06-12	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
\| *	Fix compile error on Tiger	Richard Moe Gustavsen	2009-06-10	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	the "for-in" syntax is only available on 10.5+ Reviewed-by: MortenS
* \|	Merge commit 'origin/4.5'	Oswald Buddenhagen	2009-06-08	6	-64/+294
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
\| *	Mac: play music from CD does not work in Phonon	Richard Moe Gustavsen	2009-06-08	6	-83/+313
\| \| \| \| \| \| \| \| \| \| \| \|	...because it was never implemented. This patch does that. Task-number: 255377
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	Simon Hausmann	2009-04-01	3	-7/+11
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
\| *	Get the qt7 phonon plugin to minimally compile on 10.6	Norwegian Rock Cat	2009-03-31	3	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to protect some overridden type and that is done in qmacdefines_mac.h, so just include that. To top this off, a function has changed that was introduced in 10.5. In order to use it properly, we would need to do lots of version checking and shuffling between types and it seems like more trouble that it's worth at the moment. We may have to do that in the future, but we'll deal with that then.
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	52	-0/+9619
\|
*	Long live Qt!	Lars Knoll	2009-03-23	52	-0/+9821