summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-242-4/+29
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-2257-3024/+927
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-1522-263/+546
| |\ \
| * | | QuickTime MovieViewOutput: remove view from layout and reset sourceDmytro Poplavskiy2010-03-112-4/+29
* | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-225-9/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'mmfphonon' into 4.6Gareth Stockwell2010-03-181-6/+27
| |\ \ \
| | * | | Added support for video surfaces to Phonon MMF backendGareth Stockwell2010-03-181-6/+27
| * | | | Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-184-3/+4
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-197-5/+19
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-187-5/+19
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-177-5/+19
| | |\ \ \ \
| | | * | | | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-162-2/+12
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-1625-2748/+216
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-155-23/+36
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1182-1754/+1651
| | | |\ \ \ \ \ \
| | | * | | | | | | Made header inclusion Linux friendly.axis2010-03-011-1/+1
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0177-146/+12447
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-23123-11/+21382
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-191-7/+4
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-165-513/+79
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-161-0/+11
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fixed position of plugins on Symbian.axis2010-02-121-0/+2
| | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-128-19/+370
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Disable sqlite plugin compilation on symbian by defaultThomas Zander2010-02-081-2/+0
| | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-261-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-21137-384/+406
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix symbian building to always have a pre-determined uid3Thomas Zander2010-01-193-1/+5
| | | * | | | | | | | | | | | | | Fixed Symbian detection in profile.axis2010-01-121-1/+1
* | | | | | | | | | | | | | | | | Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-1810-39/+39
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Kai Koehne2010-03-1717-236/+794
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | probably need to update user configurations once in a while tooLorn Potter2010-03-171-1/+1
| * | | | | | | | | | | | | | | use dynamicstore insteadLorn Potter2010-03-171-29/+14
| * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-1517-236/+809
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-1517-236/+809
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-1517-236/+809
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Remove configure test for NetworkManager.Aaron McCarthy2010-03-151-1/+1
| | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-1216-235/+808
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | get known wifi networks a more complicated way, but without accessingLorn Potter2010-03-122-102/+265
| | | | | * | | | | | | | | | | | fix crash on 10.6 with no wifi interfaceLorn Potter2010-03-122-5/+16
| | | | | * | | | | | | | | | | | Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.Aaron McCarthy2010-03-1116-134/+533
| | | | | | |_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | | | Pause the direct show graph when the playback rate is 0.0.Andrew den Exter2010-03-172-16/+47
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-1523-2730/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1523-2730/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1212-2707/+0
| | * | | | | | | | | | | | Fixed filename cases to support building Qt for Symbian in LinuxMiikka Heikkinen2010-03-123-3/+3
| | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-111-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Avoid unnecessary memory allocation in the jpeg handler's image detectionSimon Hausmann2010-03-111-1/+5
| | * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-101-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-101-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.Miikka Heikkinen2010-03-101-0/+0