summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1680-24/+6857
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-1265-5/+6490
| |\
| | * QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | * QmlDebug: Fix QmlOstPlugin compilation failureTom Sutcliffe2011-05-114-2/+51
| | * Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-10139-1341/+6255
| | |\
| | * | Enable performance monitoring at application startup.Kai Koehne2011-05-102-1/+14
| | * | Fixed license headerThorbjørn Lindeijer2011-05-051-8/+16
| | * | Fixed compile on WindowsThorbjørn Lindeijer2011-05-041-1/+1
| | * | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-0461-2/+6417
| * | | Remove not supported qmake apiJørgen Lind2011-05-093-6/+0
| * | | Added Wayland selection support.Laszlo Agocs2011-05-095-0/+334
| * | | Added Wayland selection support.Laszlo Agocs2011-05-096-3/+24
| * | | Add the wayland client libraries to rpath if we use rpathJørgen Lind2011-05-091-0/+4
| * | | Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-05-091-1/+1
| * | | Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
| * | | Lighthouse: Fix up XlibJørgen Lind2011-05-055-14/+10
| * | | Merge remote-tracking branch 'origin/4.8' into lighthouse-masterJørgen Lind2011-05-043-21/+35
| |\ \ \
* | \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-113-4/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-05-0425-123/+310
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Remove warningsJørgen Lind2011-05-031-0/+1
| * | | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-035-50/+26
| * | | wayland: Track wayland changesKristian Høgsberg2011-04-285-21/+12
| * | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-2814-164/+868
| |\ \ \
| * | | | Support GL ES 2 with uikit.con2011-04-276-43/+101
| * | | | Added missing function in QWaylandWindow.Samuel Rødal2011-04-191-0/+3
| * | | | wayland: Drop a debug qWarning()Kristian Høgsberg2011-04-191-3/+0
| * | | | wayland: Discard motion and button events receive with a NULL pointer focusKristian Høgsberg2011-04-191-0/+18
| * | | | wayland: Include eglconvenience.pri instead of pulling in individual fileKristian Høgsberg2011-04-191-5/+4
| * | | | wayland: Remove unused EGLConfig fieldKristian Høgsberg2011-04-191-1/+0
| * | | | wayland: Add native access interface for Wayland pluginKristian Høgsberg2011-04-195-0/+144
| * | | | Fixes compilation of wayland plugin after latest changes in wayland.Samuel Rødal2011-04-181-0/+1
* | | | | Merge branch '4.8-upstream'Thierry Bastian2011-04-2814-164/+868
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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