summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-175-3/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-145-3/+3
| |\
| | * Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-115-3/+3
* | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-0/+6
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-31249-2235/+7546
| |\ \ \
| * \ \ \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-281-0/+6
| |\ \ \ \
| | * | | | Fixed a build library deployment issue in sqlite.axis2011-01-281-0/+6
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-24/+10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-082-19/+5
| |\ \ \ \ \
| | * | | | | Use the thread-default glib context for the DBus connection in the ICD bearer...Jocelyn Turcotte2011-02-081-1/+1
| | * | | | | directfb: Pixmap creation always premultiplied the alpha even when it is alre...Denis Oliver Kropp2011-02-041-18/+4
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-081-3/+3
| |\ \ \ \ \ \
| | * | | | | | Fix random crashes when bearer suddenly goes downShane Kearns2011-02-041-3/+3
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Doc: Fixed qdoc warning.David Boddie2011-01-251-3/+3
* | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-106-2/+281
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-046-2/+281
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-041-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Fixed library casing.axis2011-02-031-1/+1
| | | |/ / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-035-2/+280
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19196-935/+216
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-073-8/+9
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-204-16/+95
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | QDeclarativeDebug: Move Tcp server to separate pluginKai Koehne2010-12-175-2/+280
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use the thread-default glib context for the DBus connection in the ICD bearer...Jocelyn Turcotte2011-02-091-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-032-4/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-031-1/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Prevent recursion when creating window surface.Samuel Rødal2011-02-021-1/+7
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Fix for QTBUG-17035kranthi2011-02-021-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-26198-959/+225
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17198-937/+217
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-111-0/+3
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-111-0/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-10191-191/+191
| | | |\ \ \ \ \ \
| | | * | | | | | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-101-0/+2
| | * | | | | | | | Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into inte...Lorn Potter2011-01-114-585/+20
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20
| | * | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-10191-191/+191
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-074-159/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-201-0/+3
| | | |\ \ \ \ \ \
| | | * | | | | | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-164-159/+0
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-14/+2
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-6/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | | |/ / / | | |/| | |
* | | | | | Lighthouse: License headers to new files in testliteJørgen Lind2011-01-2611-1/+411
* | | | | | Lighthouse: Wayland. Make the wayland integration closer to LighthosueJørgen Lind2011-01-2613-39/+99
* | | | | | Lighthouse: Wayland, only make one fbo for the WaylandPaintDeviceJørgen Lind2011-01-262-87/+138