summaryrefslogtreecommitdiffstats
path: root/src/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Update Phonon core to 4.4.0Justin McPherson2010-03-251-24/+40
|
* Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * fix "make debug" under windowsOswald Buddenhagen2009-06-111-1/+1
| | | | | | | | | | | | | | | | | | use relative path for include (like every other subtree does), otherwise $$fromfile() does not find the file, thus the template is unknown and thus the generic "first" target is used instead of "debug", which tries a generic build against non-existing release libs - boom. Reviewed-by: TrustMe
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+115
|
* Make Qt exception safer.Robert Griebl2009-06-101-2/+1
| | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* Added proper UID for phonon.pro, and did some symbian scope cleanup, too.Miikka Heikkinen2009-06-041-8/+10
|
* Let phonon build for winscw.Frans Englich2009-05-051-0/+6
|
* Add include paths for STL such that phonon builds. See comment for details.Frans Englich2009-05-051-0/+7
|
* Long live Qt for S60!axis2009-04-241-0/+115