summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix platforms.pro scope to match all QNX platformsRafael Roquetto2012-04-021-1/+1
| | | | | | | | cherry-picked from qt5/qtbase: d5bc8ab811f380116c5a55a777150bc47a43a6bb Change-Id: I8d2f906c52ae56ec5cfce70f94ec3661e7d0e15f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Separate virtual keyboard interface and implementationKevin Krammer2012-04-0110-109/+252
| | | | | | | | | | | Allows us to create a BPS based implementation and drop it in without further changes to users of the interface. Backport of 831943d7f12addef79fb536e5550da0f72480217 Change-Id: Ib047f4bbc68743cfe8c2293a235d4e9ca8195af9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Move screen event processing into its own classKevin Krammer2012-03-306-514/+653
| | | | | | | | | | | | The event handler class can then be reused when we have proper BPS event support available from corelib Backport of a80a2c6da241dac77f533bc702a1c7d94349a812 Change-Id: I9f8f661ca6b976aa02990bc8c8af8e5472e5faa4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Refactoring virtual keyboard class into non-singletonKevin Krammer2012-03-3010-64/+93
| | | | | | | | | | | | | | | | Getting rid of the singleton gives us better control over when the virtual keyboard handling class is instantiated and configured. Also notify screens about keyboard height changes and let them notify through QWindowSystemInterface instead of "guessing" the screen in QQnxVirtualKeyboard. Backport of 5d117fd427e3e727df5d3f417a2b91366f2a31c1 Change-Id: I49c1a6af5decca47a5ab3ba382430a2b25578d40 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Support QDesktopServices on BlackBerry platformsRafael Roquetto2012-03-291-0/+12
| | | | | | Change-Id: I10506b83efda8efb12ccc531f60cd4cd9b4b5bc9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make QNX virtual keyboard handling main event loop drivenKevin Krammer2012-03-222-86/+90
| | | | | | | | | | | Refactor from polling in an endless loop running in a separate thread to using a QSocketNotifier working on the main thread. Backport of 29518b04a619fdd7784e88eebe687fb87ae8a8b5 Change-Id: I8993b874f1543d5e85b0911c81a7a9ec072e5160 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Use main thread event loop for navigator event processingKevin Krammer2012-03-225-71/+53
| | | | | | | | | | | Removes the need for an extra thread by creating the event handler's socket notifier in the context of the main thread. Backport of 9dc86ac0f2d019f93665c1ae0e3c2cd33fd88bce Change-Id: I5c31d904191f45698085e8fd576481018e072ef4 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* TGA imageformat: fix broken canRead plugin functionAlexander Anokhin2012-03-191-3/+5
| | | | | | | | | | Plugin is now moving QIODevice pos to 0 before exiting from canRead function, so it doesn't break other existing imageformat plugins functionality. Task-number: QTBUG-24201 Change-Id: Ib58b0458215cf5ad705dffa0aaf6a7463d1f089e Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* BlackBerry Plugin: support 8 mouse buttons, instead of just 3.Kevin Krammer2012-03-091-3/+10
| | | | | | | | | | | | | | | | The mask of possible mouse buttons in QNX provides tracking for the up/down State of up to 8 mouse buttons. This update adds support or 2 of buttons which we previously ignored in Qt on this Platform. Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase reduced to the 5 buttons Qt4 has support for Related to task-number: QTBUG-24682 Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Use QSocketNotifier instead of sleeping in an endless loopKevin Krammer2012-03-092-35/+51
| | | | | | | | | Event driven listening for navigator events, basically a backport of the respective QPA plugin code in Qt5/qtbase Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix platforms.pro to match new qnx mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | | | | cherry-picked from Qt5/qtbase 4ba895a86 Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Improving clipboard integrationKevin Krammer2012-03-062-44/+157
| | | | | | | | | | | | | | | | Derive a data accessor class from QMimeData so application level code can query MIME type availability through it or directly attempt to fetch data by MIME type even if the type is not yet known to QBBClipboard. Also make sure any MIME type used by the application in setMimeData operations is checked for availability when being queried for formats. This is a backport of 08cc2d27794e6bafb75cdc35b6966def35f9facb in master of Qt5 qtbase Change-Id: I86455cfb58e2e00ac3e992a8228ee7167f8d2a20 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add egl include paths and link lines to eglfs.Girish Ramakrishnan2012-03-061-0/+11
| | | | | | | Similar to the code in gui/egl/egl.pri. Change-Id: I1dbcf6f0d70405d8dc9f404bfed64fdfcd7c14ab Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* React to changes of focus widgetKevin Krammer2012-03-052-0/+15
| | | | | | | | | | | Needed to automatically show/hide virtual keyboard when focus changes in or out of an input widget Change-Id: I21325452938e1d551bcc4421721f3bc5d85c5fbf Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-051-1/+1
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed missing parenthesesRobert Loehning2012-03-051-1/+1
| | | | | | Change-Id: Ic0a2f9bb6a1d59261240fc0de85d6db52974c964 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fixing z-ordering of windowsKevin Krammer2012-03-021-1/+1
| | | | | | | | | | | | | | The application root window is at z-order == 0, all platform windows created for Qt windows are its descendants, so their base value for z-order needs to be 1. Backport of qtbase 117bdad3f270a4c0589cff332a7a8e904263de08 Change-Id: Ic1fb91c30559177bc094a5db96e4088860a8d6ac Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed handling of keyboard info messages.Kevin Krammer2012-03-021-3/+3
| | | | | | | | | | | | | Country and language values were assigned to in the case of decoding failure but left unchanged in case of success. Thus members mLanguageId and mCountryId remained at "en" and "US" respectively instead of being changed to whatever the keyboard sent. Change-Id: I9f48a55d3c431458426c5c4da8e69600948f219b Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Include blackberry QPA plugin when building for blackberry make specKevin Krammer2012-03-021-0/+3
| | | | | | | Change-Id: Ia756609ed4406deacf92e15b4e6591a91ef5c8a6 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix xcb-icccm 3.8 supportGirish Ramakrishnan2012-03-011-0/+25
| | | | | | | | | | | | Build fix on platforms having xcb-icccm >= 3.8 This is a backport of 7ce8491280990350162933a0716d1b014f65aeb6 and f005dee1b3692a09e47782dcff9b5b07aa659b51 from qtbase. Change-Id: Ic6cbb555335a74cc7b00273081c249aa7e08afaf Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix static build of Qt for WinCE and WEC7.Janne Anttila2012-02-271-2/+0
| | | | | | | | | | | | | | | | | When doing a static build of Qt for WinCE/WEC7, the sqlite database driver is statically built into Qt library. In that case relevant HAVE_LOCALTIME_S=0 defined in sqlite.pro under plugins folder does not have effect because qsql_sqlite.pri and further 3rdparty/sqlite.pri are directly included to QtSql library. Moved the needed define down to such *.pri file which is included in both static and non-static Qt builds. Task-number: QTBUG-24500 Change-Id: Iacbdd6d02fc31558a1ce91f42756eaac5053414b Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Port QBBRootWindow from the Qt 5 QPA plugin.Robin Burchell2012-02-255-222/+375
| | | | | | | | | This lessens unnecessary delta between the two. Change-Id: I3bb33d977573e3404dd08c2f4e396d18dd63ddc7 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Implemented QAccessibleTextWidgetJosé Millán Soto2012-02-212-179/+312
| | | | | | | | | | | | | | | A new class called QAccessibleTextWidget was added. This class should implement all methods of QAccessibleTextInterface and QAccessibleEditableTextInterface which only need a QTextCursor, and it defines two pure virtual methods, to obtain and set the text cursor, so accessible implementations of widgets which use a text cursor can implement these two methods. QAccessibleTextEdit is now a subclass of QAccessibleTextWidget and most of its methods were moved to QAccessibleTextWidget. Change-Id: Ie30e7b377cb9b381c2ef6017ecb188fd0fdeeddb Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Initial import of the BlackBerry Playbook QPA plugin.Rafael Roquetto2012-02-2133-0/+7381
| | | | | | Change-Id: Ibc883be9af145eafef2e5ff9eb82c3364bace331 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* RR scheduler error handling for deleted active objectsMurray Read2012-02-201-2/+4
| | | | | | | | | | | | | | | | | | We have discovered that the active object ConnectionStarter could potentially leave after deleteing itself in RunL. If that were to happen, QtRRActiveScheduler::RunMarkedIfReady would have crashed when it asked the deleted active object to handle the error. Some active object deletion detection has been added to QtRRActiveScheduler::RunMarkedIfReady to protect against crashes. The ConnectionStarter active object has been modified so that even if it does leave, when running in CActiveScheduler, it still won't cause a crash and will clean itself up correctly. Task-number: ou1cimx1#979241 Change-Id: Iafa10b96bbd8bedfec82d6d546c7ffaf0557fd8b Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fixed typo in text: "dpeth" -> "depth"Sergey Belyashov2012-02-201-1/+1
| | | | | | Change-Id: Ic910dc63db5625640735e2918f09c75a1d8669cc Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix online status checking in generic bearer plugin.Xizhi Zhu2012-02-151-1/+1
| | | | | | | | | | | | | QNetworkInterface::IsUp means the interface is up, but not necessarily connected. QNetworkInterface::IsRunning means the interface is up and connected. Cherry-picked from Qt5 / QtBase commit: c93ac6758606f64af7fe2bac6c8bb08391d218a7 Task-number: QTBUG-22873 Change-Id: Ieb544058814520b4292b496de2e4672214f3d00a Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Added QAccessibleGroupBoxJosé Millán Soto2012-02-103-18/+144
| | | | | | | | | | | | Added a new accessible interface for QGroupBox, as QAccessibleDisplay is not good enough when the QGroupBox is checkable. AccessibleFactory was modified to return a QAccessibleGroupBox when the accessible interface of a QGroupBox is requested. Created tst_QAccessibility::groupBoxTest Change-Id: I6c23dcf5562b3ea269b04102e78463b65827188a Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-091-1/+1
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fixed qmldbg_inspector build for WEC7.jaanttil2012-02-061-0/+4
| | | | | | | | | | WEC7 does not have std::floor, define it in qfunctions_wince.h and include qfunctions_wince.h to qmldbg_inspector in WinCE environments. Task-number: QTBUG-22510 Change-Id: I801d908bf1a70203619e3af9262d7ffcb8ccb1bb Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Make copy and cut methods work in QAccessibleTextEditJosé Millán Soto2012-02-061-3/+10
| | | | | | | | Correct the implementation of cutText and copyText in QAccessibleTextEdit so they use cut() and copy() methods of QTextEdit Change-Id: I86a531ed7059b1a928cb8515c2743d4d8b596b36 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* QDirectFBPaintEngine::fill crashes if QVectorPath elements is NULLRamamurthy KV2012-01-301-2/+4
| | | | | | | | | Checking for elements to not NULL. If the shape is QVectorPath::RectangleHint calling fillRect and not falling to RASTERCALLBACK. QTBUG #23850 Change-Id: I402da6074a1c7a9b1d026efe5d1b068e4aea8805 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Symbian - add rom upgrade flag to Qt sis filesShane Kearns2012-01-261-1/+1
| | | | | | | | | | | | The rom upgrade flag allows the sis file to be installed if there is already a version of the dll in rom. The flag is silently ignored unless the sis file is properly signed with a certificate trusted for this purpose. This change saves developers needing to edit pkg files after running qmake. Change-Id: I0914734c951ea1f0d1c48b169bee0b022bc9e275 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* uikit: adapt to new xcode and examples.Eike Ziller2012-01-253-21/+23
| | | | | Change-Id: I284199e0f0e77d28e1c72be1aaae1a9ac7c0f465 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* uikit: update readme, endian test fails with newer xcodeEike Ziller2012-01-251-2/+2
| | | | | | | | The test assumes that the "strings" command in the PATH is able to handle target binaries, which fails. Just specify explicitly. Change-Id: I8488cb8e71f47f564dfb1790c505e94b2d4a7def Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Handle closable tabs in QAccessibleTabBarJosé Millán Soto2012-01-182-1/+68
| | | | | | | | | | Tab information was hidden by the closing buttons. Closing is implented by using doAction and actionText methods, as it's not possible to use QAccessibleActionInterface to send actions to child widgets in complex widgets. Change-Id: I0f55d5084737fa13c81df402f5dd54f11e164f8a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* symbian - fix lockup when a network session is opened from its errorShane Kearns2012-01-131-6/+6
| | | | | | | | | | | | | | | When QNetworkAccessManager::get is called from the slot connected to QNetworkAccessManager::finished, this is equivalent to calling QNetworkSession::open from the slot connected to QNetworkSession::error. Close handles before emitting the error signal, instead of afterwards. Otherwise the session start would be silently cancelled in the above situation. Task-number: ou1cimx1#960395 Change-Id: I48cb376722e0169721fd33614a0b9280c17bdd62 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* add missing multiple inclusion guardMark Brand2012-01-121-0/+5
| | | | | Change-Id: I019d468ef683a0d4040782df9d22b198b4cca86b Reviewed-by: hjk <qthjk@ovi.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11473-473/+473
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2012-01-021-1/+1
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Adapt autotests to commit e2773a9 Declarative: Use qDebug() for debugger status updates Declarative: Unify output of warning messages in debug server
| * Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2012-01-021-1/+1
| |\
| | * Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although "Qml debugging is enabled. Only use this in a safe environment!" is a warning, using qWarning() for it let every app crash that is run with QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that happen during 'normal' operation. Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2
* | | directfb: Backport the work from QtBase to Qt 4.8Holger Hans Peter Freyther2011-12-1319-282/+653
| | | | | | | | | | | | | | | | | | | | | | | | This is copying the files (minus the API changes) to Qt 4.8. It fixes memory leaks, adds DirectFB based image decoding, prepares EGL integration/ Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | [blitter] Work on tst_QPixmap::clear()Holger Hans Peter Freyther2011-12-132-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default QPixmap may not hasAlphaChannel(), only if setMask() or fill() with a transparent color is called a QPixmap will hasAlphaChannel(). Make the QBlittablePlatformPixmap remember if there is an alpha channel, pass this as parameter in createBlittable to make it clear that this is required and not optional. Update the DirectFB plugin to handle this parameter to create a RGB32 or ARGB Surface depending on the alpha value, also only use PreMultiplied alpha when using ARGB. Separate the two constructors for the QDirectFbBlitter to either adopt a DirectFB Surface or to create one. Cherry-picked-from: qtbase:ab50b60f5cc237d5620f3ff3b2eb44c857f8f60b Change-Id: I8abf82408ecd2d075fc6f241ace8be2a34ac56e7 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-052-12/+48
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
| * | Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-302-12/+48
| |/ | | | | | | | | | | | | | | | | | | | | | | When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-292-0/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * Fix permission (no execute bit).Frederik Gladhorn2011-11-222-0/+0
| |
* | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-264-4/+4
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-224-4/+4
| |\ \ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Doc: Fixing typo
generated by cgit v0.12 at 2025-04-17 01:49:44 (GMT)