summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-2/+14
| |\ \ \
| | * | | Fixed a build library deployment issue in sqlite.axis2011-03-041-0/+6
| | * | | Changed various qmake constructs to support Windows.axis2011-02-181-2/+8
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-101-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | Don't use EGL surfaces for translucency with 32MB GPU chip.Jani Hautakangas2011-03-101-5/+7
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump Qt version to 4.7.3Timo Turunen2011-03-091-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-081-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Fix possible bearer management Crash with Panic E32USER-CBase, 69Cristiano di Flora2011-03-081-6/+5
| * | | | Unsuccessful unlocking of QNetworkConfigurationPrivate mutexPerttu Pohjonen2011-03-071-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-074-0/+34
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-074-0/+34
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-0115-143/+391
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-231-0/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-231-0/+5
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-205-20/+36
| |\ \ \ \ | | |/ / /
| | * | | Prevents crashing when ICO file has bad color table valueMauri Vehniäinen2011-02-181-0/+2