summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-081-0/+1
|\
| * Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-301-1/+1
|\ \
| * | Fixed contains check casing in mmf.pro fileTomi Vihria2011-05-301-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-263-6/+23
|\ \ \ | |/ /
| * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-2/+10
| * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-253-6/+15
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-0/+6
|\ \ \ | |/ / |/| / | |/
| * Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-191-2/+2
|\ \ | |/
| * Fix brush transform in QtDirectFB backend, fixing QTBUG-18577Denis Oliver Kropp2011-05-191-2/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-192-137/+299
|\ \ | |/
| * directfb: Paint engine enhancementsDenis Oliver Kropp2011-05-192-137/+299
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-183-15/+6
|\ \ | |/ |/|
| * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-183-15/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17198-3380/+3380
|\ \
| * | Update licenseheader text in source filesJyri Tahtela2011-05-13198-3380/+3380
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
|\ \ \
| * | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-102-2/+18
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-2/+18
| |/
* | Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
|\
| * Fix Symbian/Linux compilation breakage in plugins/qmltoolingKai Koehne2011-04-201-1/+1
* | Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-181-1/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-1510-7/+703
|\ \ | |/
| * QmlDebug: Fix license headers in new ost pluginKai Koehne2011-04-155-65/+65
| * Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym...Tom Sutcliffe2011-04-147-0/+692
| * QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-144-4/+3
| * QDeclarativeDebug: Don't crash when connection is closedKai Koehne2011-04-141-3/+8
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-311-1/+1
|\ \
| * | Fixed not switching to MeeGo graphicssystem.Samuel Rødal2011-03-301-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-291-1/+11
|\ \ \ | |/ /
| * | QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-281-3/+2
|\ \ \ | |/ / |/| |
| * | directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-232-10/+13
|\ \ \ | |/ /
| * | Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-222-4/+0
|\ \ \ | |/ / |/| |
| * | Remove useless profile reference.axis2011-03-222-4/+0
* | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-213-15/+225
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-182-6/+19
| |\ \ \
| | * | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-182-6/+19
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-171-1/+38
| |\ \ \ \ | | |/ / /
| | * | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-163-15/+175
| |\ \ \ \ | | |/ / /
| | * | | QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.Tapani Pälli2011-03-161-1/+1
| | * | | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-162-14/+174
* | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-211-1/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-151-2/+14
|\ \ \ \ | | |/ / | |/| |