summaryrefslogtreecommitdiffstats
path: root/src/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-291-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * 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