summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
|\
| * 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
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-2011-8/+706
|\ \ \
| * | | Fix compilation with symbian-armccOlivier Goffart2011-04-191-1/+1
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-191-1/+3
| |\ \ \ | | |/ /
| | * | Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-181-1/+3
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-1810-7/+703
| |\ \ \ | | |/ /
| | * | 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 remote-tracking branch 'earth-team/master' into earth-staging-masterOlivier Goffart2011-04-203-156/+162
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"Martin Petersson2011-04-181-5/+0
| * | | QNativeWifiEngine: Fix problem with wifi polling on WindowsMartin Petersson2011-04-141-0/+5
| * | | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into symbian-socke...Shane Kearns2011-04-1114-28/+65
| |\ \ \
| * | | | Add partial upgrade rules for Qt's pluginsShane Kearns2011-03-311-0/+19
| * | | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-25198-1191/+8817
| |\ \ \ \
| * | | | | Make creating sockets with an explicit network session thread safeShane Kearns2011-03-151-0/+3
| * | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ...Shane Kearns2011-03-082-142/+138
| |\ \ \ \ \
| | * | | | | Refactor dangerous multiple inheritanceShane Kearns2011-02-212-25/+86
| | * | | | | Fix RConnection handle leak in symbian bearer pluginShane Kearns2011-02-212-56/+40
| | * | | | | Remove open C setdefaultif support from symbian QNetworkSessionShane Kearns2011-02-212-68/+3
| | * | | | | Explicit network session for QNetworkAccessManagerShane Kearns2011-02-172-1/+7
| | * | | | | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-07249-2258/+7651
| | |\ \ \ \ \
| | * | | | | | Fix random crashes when bearer suddenly goes downShane Kearns2011-02-041-3/+3
| | * | | | | | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-121-2/+4
| | * | | | | | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-1528-213/+234
| | |\ \ \ \ \ \
| | * | | | | | | default RConnection for socketsShane Kearns2010-12-071-0/+10
| * | | | | | | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-08269-2604/+8269
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Use shared socket server session everywhereShane Kearns2010-12-062-16/+4
* | | | | | | | | Adapt to different uikit resolutions.con2011-04-152-12/+10
* | | | | | | | | Lighthouse: Make directfb conform with ligthhouse gl context apiJørgen Lind2011-04-151-0/+2
* | | | | | | | | Compile fix for window surface features. (uikit)con2011-04-152-1/+6
* | | | | | | | | Lighthouse: Fix license headersJørgen Lind2011-04-151-0/+43
* | | | | | | | | Remove hasOpenGL. This changes breaks binary compatibillityJørgen Lind2011-04-1413-19/+32
* | | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-1414-27/+101
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-05151-1130/+8585
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-033-5/+14
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-313-5/+14
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | 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
| | * | | | | | | | | | Modified pvrqwswsegl.c to make PowerVR work for processors using flipbuffer c...Arun Voleti2011-04-011-2/+3
| | * | | | | | | | | | Check that pixmap is not null before accessing itPauli Nieminen2011-04-011-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-244-14/+13
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /