summaryrefslogtreecommitdiffstats
path: root/src/plugins/plugins.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-241-1/+1
|\ | | | | | | | | | | Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
| * Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-1/+4
| |\ | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * | Convert generic engine into a plugin.Aaron McCarthy2009-12-221-1/+1
| | |
| * | Commit patch by Gareth.Frans Englich2009-08-121-0/+1
| | | | | | | | | | | | | | | The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did.
| * | Merge branch 'master' into topic/mmfphononFrans Englich2009-08-121-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro
| * \ \ Merge commit 'origin/master' into topic/mmfphononFrans Englich2009-07-211-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro src/s60installs/qt.iby
| * | | | Include Phonon plugins for Symbian.Frans Englich2009-07-211-1/+1
| | | | |
* | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-1/+1
| |_|_|/ |/| | | | | | | | | | | QDeclarativeXXX.
* | | | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-191-0/+2
| | | |
* | | | Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-151-1/+2
| |_|/ |/| |
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-061-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * | Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+1
| | |
| * | Long live Qt!Lars Knoll2009-03-231-0/+12
| /
* | Fix plugins properly.Jason Barron2009-07-101-1/+2
| | | | | | | | | | | | The 'else' block is not the correct place to add the s60 subdir because this will also build the plugin for other non-unix platforms which is not correct. It should be built on symbian.
* | someone forgot this import module: s60Liang Qi2009-07-101-1/+1
| |
* | Tweak deployment rules after addition of OpenVG.Jason Barron2009-07-091-3/+2
|/ | | | | | | 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.
* Long live Qt for S60!axis2009-04-241-0/+13