Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-19 | 1 | -1/+9 |
|\ | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp | ||||
| * | Update IBY file to contain all Qt modules, inc. phonon, multimedia, sql | Iain | 2009-10-14 | 1 | -0/+8 |
| | | | | | | | | Reviewed-by: Janne Koskinen | ||||
* | | Symbian build fixes | Martin Jones | 2009-10-16 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' into topic/mmfphonon | Frans Englich | 2009-08-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro | ||||
| * | 'Trailing whitespace' fixes from s60installs | Janne Anttila | 2009-08-04 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'origin/master' into topic/mmfphonon | Frans Englich | 2009-07-21 | 1 | -0/+7 |
|\ \ | |/ | | | | | | | | | Conflicts: src/plugins/plugins.pro src/s60installs/qt.iby | ||||
| * | Tweak deployment rules after addition of OpenVG. | Jason Barron | 2009-07-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Add the Phonon MMF backend. | Frans Englich | 2009-07-21 | 1 | -0/+6 |
|/ | |||||
* | Add dependancy on Symbian OS std C++ support now the exceptions branch | Iain | 2009-06-22 | 1 | -0/+1 |
| | | | | has been merged | ||||
* | IBY files for adding Qt into ROM | Iain | 2009-05-08 | 1 | -0/+94 |
RevBy: jbarron |