summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | Doc: Fixing typoSergio Ahumada2011-08-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Linux-Symbian parallel cross-compilation configure step Symbian: don't merge native clipboard, overwrite. Surviving out of memory in Qt Quick app Export QtGui functions required by QtMultimediaKit backend fix bearer crash Fix alignment of non-wrapped richtext QML Text elements.
| * | | | fix bearer crashShane Kearns2011-11-161-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Handle could be closed too early in some situations causing a panic. Reviewed-By: mread
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-11-237-0/+731
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Sequential reading not supported. DeclarativeDebugServer: Instantiate QPluginLoader on heap Fix failing unit tests. qmlplugindump: Fix dumping empty names for generated QMetaObjects. Fix compile with -qtnamespace Properly protect access to pixmap reader thread with mutex Move tga support from Qt3d to Qt. Move tga support from Qt3d to Qt. Properly protect access to pixmap reader thread with mutex qmlplugindump: Add flush to fix output redirection on windows.
| * | | Fix failing unit tests.Sarah Smith2011-11-172-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test that was failing was the readFromDevice one - where the extension is not known. Looks as though image detection is required in a positive way, that is it is not enough to say I think I can read this file, and then fail if the format is "corrupt", you must be certain that the file was intended to be that format. In the case of TGA the original format has no magic byte header, and no consistent way to check if it really is a TGA file. With 2.0 the footer was added at the end, so that can be checked for confirming the file is TGA. However rejecting files which do not have this means that old TGA files will not be read. On a quick survey TGA files that have been used in applications so far all seem to be 2.0 TrueVision, so for now, lets just reject earlier files and see how it goes. Also add reading the tga test file to the readFromDevice test.
| * | | Fix compile with -qtnamespaceSarah Smith2011-11-165-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | Also fix header includes to match Qt core style. RevBy: Patrick Burke
| * | | Move tga support from Qt3d to Qt.Sarah Smith2011-11-147-0/+694
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rev-By: Samuel Rodal Fix-for: QTBUG-21955 Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955 Having tga plugin inside a Qt add-on causes packaging problems. There have been many queries over the years for tga support even tho it is a niche image format. It is particularly useful for OpenGL work as a texture format since it is a blittable bitmap, but it is very innefficient compared to png or jpg. For this reason only read support is added, and this is documented. Also add some unit tests. The unit tests are in the qimagereader suite, and this is the right place for them as the other formats are tested there. Noticed that there was an annoying bug with tiff files and chased it down, in the hope of getting a clean test case PASS. Looks as tho there is a bit of work for someone to fix the other FAILs, but the ones for tga are all passing.
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-282-15/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| * | | | Symbian Linuxification building case changesPasi Pentikainen2011-10-202-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the libraries to match the case of files for building Symbian in linux. Reviewed-by: Miikka Heikkinen
* | | | | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-071-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to Thiago, setting the pointer with the same values *is* thread-safe Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | | | | nativewifi bearer plugin: prefer DLL Safe Search modeKonstantin Ritt2011-10-071-14/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | by using QSystemLibrary instead of QLibrary Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-09-275-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Update changes-4.8.0 file Only limit cursor position when line is wrapped Make sure cursor position doesn't exceed line end Allow shared EGL contexts for xcb and xlib platforms Allow generic EGL platform contexts to be shared 4.8 Changes: OpenGL Framebuffer Format stop tslib plugin having same file name as linux input plugin Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
| * \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-223-10/+117
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
| * | | | | Allow shared EGL contexts for xcb and xlib platformsReuben Dowle2011-09-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1331 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Allow generic EGL platform contexts to be sharedReuben Dowle2011-09-192-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1331 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | stop tslib plugin having same file name as linux input pluginReuben Dowle2011-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1330 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-265-1/+149
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Improve sbsv2 whatlog support. Modified SymSQL documentation in sql-driver.qdoc according review comments Added correct licence headers to symsql source files Documentation modifications for SymbianSQL added into sql-driver.qdoc Release Symbian SQL driver Fixed a typo found by static checker Added SQL driver plugin implementation for Symbian. Symbian: Fix qmdiarea autotest regressions Fix memory leaks in schema validation Symbian: Added copy-paste functionality to FEP input context symbian: Implement QNetworkConfiguration::purpose() symbian bearer: fix tst_qnetworksession test failures Fix the incorrect sizeHint given by QLabel on Symbian
| * | | | | | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-211-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
| * | | | | | Added SQL driver plugin implementation for Symbian.Timo Kauppinen2011-09-212-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian SQL driver enables the usage of native Symbian SQL server from Qt code. Symbian SQL driver also supports the usage of Symbian platform security capabilities. Task-number: QT-4860 Reviewed-by: Honglei Zhang
| * | | | | | symbian: Implement QNetworkConfiguration::purpose()Shane Kearns2011-09-202-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfiguration::purpose() will now return translated values for the system SNAPs rather than always UnknownPurpose. e.g. the "Internet" SNAP returns PublicPurpose, and the WAP/MMS SNAPs return ServiceSpecificPurpose. IAPs inherit the purpose of the service network that contains them, unless the same IAP is present in more than one with conflicting purposes, in which case UnknownPurpose is returned. Task-Number: QTBUG-19166 Reviewed-By: mread
| * | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-204-17/+91
| |\ \ \ \ \ \
| * | | | | | | symbian bearer: fix tst_qnetworksession test failuresShane Kearns2011-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian is not reporting the expected KLinkLayerClosed event on the last RConnection handle. Instead, it reports the event KConfigDaemonFinishedDeregistrationStop, which indicates the nif plugin is being destroyed (this is followed by unload events) To fix, this event is treated the same as a link down event, and results in the state change to disconnected. Either there has been a behaviour change in the platform, or the test was previously run with another user of the API running in the background (e.g. WLAN wizard, connection monitor) which prevented the unload. Task-Number: QTBUG-21382 Reviewed-By: mread
* | | | | | | | Fix accessible menu not returning child name.Frederik Gladhorn2011-09-231-1/+1
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessible name is set, QAccessibleMenu would always return the menu's name, not that of the child action. Task-Number: QTBUG-21578 Reviewed-by: Jan-Arve
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-201-2/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| * | | | | More accurately determine bearer type for symbian GPRS/3GShane Kearns2011-09-131-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbian IAP records don't distinguish between GRPS/EDGE/3G/HSPA, although the phone knows what type of cell it is attached to. For the IAP records which are of packet data type (reported as KCommDbBearerWcdma), we now query the phone network mode to determine the bearer type to report. The Qt API doesn't distinguish GRPS/EDGE (both are "2G") The Symbian API doesn't distinguish 3G and HSPA unless there is an active connection. So we have to report both of these as WCDMA. When a connection becomes active, we update Qt's IAP record list to show the known connection type (which may include HSPA now). Qt already contained code to observe roaming between cell types, which reports all types. Note that the bearer type may change during connection (handover to another cell may occur), which should be covered by the already existing code. Task-Number: QTBUG-19011 Reviewed-By: mread
| * | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-3113-61/+276
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-08-251-1/+3
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-161-2/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14368-702/+46240
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
generated by cgit v0.12 at 2025-02-06 06:02:11 (GMT)