summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Build fix for WINCE to qfilesystemengine_win.cppjaanttil2011-10-051-1/+0
| | | | | Merge-request: 2662 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is ↵shkim2011-09-291-2/+0
| | | | | | | defined. Merge-request: 2690 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* retreving -> retrievingAlbert Astals Cid2011-09-281-3/+3
| | | | | | | Reported by Freek de Kruijf in KDE translation project Merge-request: 1405 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-28107-3499/+5986
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-09-277-13/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2242-3128/+3241
| | |\ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
| | * | Only limit cursor position when line is wrappedJiang Jiang2011-09-211-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | * | Make sure cursor position doesn't exceed line endJiang Jiang2011-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have trailing spaces at the end of a line, cursor will disappear because the position we returned exceeds line end, thus the widget border. By limiting it within line.width we can make sure it always visible, which is more consistent to the behavior in common platforms. Reviewed-by: Eskil
| | * | 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-fire-teamaavit2011-09-191-7/+5
| | |\ \
| | | * | Avoid unnecessary detach of a QImage in QPixmapDropShadowFilterDavid Faure2011-09-191-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1374 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-2620-233/+2290
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-221-0/+8
| | |\ \ \ \
| | | * | | | Fix the incorrect sizeHint given by QLabel on SymbianJarkko T. Toivonen2011-09-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the S60 clientRect width in the QLabel size hint calculation (instead of assuming that 80 characters will fit on one line). Task-number: QTBUG-14318 Reviewed-by: Murray Read
| | * | | | | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-213-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
| | * | | | | Release Symbian SQL driverHonglei Zhang2011-09-211-175/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian SQL driver provides service of secure databases. SQL databases are stored in Symbian SQL server's private data cage. The API ensures only authorised clients can access the database. The Symbian SQL driver enables Qt application to use Symbian secure databases. Task-number: QT-4860 Reviewed-by: Trust Me
| | * | | | | Fixed a typo found by static checkerTimo Kauppinen2011-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewd-by: Honglei Zhang
| | * | | | | Added SQL driver plugin implementation for Symbian.Timo Kauppinen2011-09-215-0/+1467
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Merge branch 'SchemaMemLeak'Honglei Zhang2011-09-219-212/+214
| | |\ \ \ \ \
| | | * | | | | Fix memory leaks in schema validationHonglei Zhang2011-09-219-212/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fix for QTBUG-12550. QExplicitlySharedDataPointer is excessively used in XmlPatterns code. This forumate cyclic loops in some situation. This fix replace the shared data pointer with normal C++ pointer to break the loop. Task-number: QTBUG-12550 Reviewed-by: Tomi Vihria
| | * | | | | | Symbian: Added copy-paste functionality to FEP input contextMiikka Heikkinen2011-09-212-20/+597
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The support for copy-paste functionality in FEP was initially submitted as merge request #1151, though that only provided support for basic Qt edit widgets. I modified the code so that QML edit elements are also supported, as well as any other editor that provides the required "copy", "cut", and "paste" slots, and "canPaste" property. A number of other minor fixes were also done to the original merge request, as well as the removal of S60 version plugin elements. Task-number: QTBUG-20921 Reviewed-by: Sami Merila
| | * | | | | | 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-2095-598/+913
| | |\ \ \ \ \ \
| | * | | | | | | 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
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-09-241-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix accessible menu not returning child name.
| | * | | | | | | | 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/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-221-1/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix broken Solaris build (getpwnam_r usage)
| * | | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)Andreas Kling2011-09-221-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'qtwebkit-integration/4.8'Andreas Kling2011-09-212-44/+44
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Workaround MSVC2010 problems when linking QtWebKitAdemar de Souza Reis Jr2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
| | * | | | | | | | dos2unix on a webkit source file (fix support for Visual Studio)Ademar de Souza Reis Jr2011-09-201-43/+43
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-2033-3103/+3128
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * | | | | | Fix missing clean up stack panic for a new thread in SymbianTomi Vihria2011-09-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clean up stack for a new thread was created in a too late phase for a process that doesn't have symbianVersion string in its cache Task-number: QT-5269 Reviewed-by: Murray Read
| | * | | | | | Regression in QS60Style when drawing webview scrollbarsSami Merila2011-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWebviews draws scrollbar background with bright green. This is regression caused by QS60Style change SHA 7dfa50a9b97d28813341329a55aa1a4b5a7de527. This SHA changed theme background creation to happen just before drawing. Unfortunately, web widgets have slightly different palette than non-web widgets, so the style didn't catch the incorrect background texture when painting. Thus, the background was drawn with initialized color (green). Task-number: QTBUG-21463 Reviewed-by: Miikka Heikkinen
| | * | | | | | Cleanup qwidget_s60.cppMiikka Heikkinen2011-09-141-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some unused code from qwidget_s60.cpp. Reviewed-by: TrustMe
| | * | | | | | Fix panic when global QSettings instance needs flusing at app exitMiikka Heikkinen2011-09-131-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lack of cleanup stack caused panic when the global static QSettings instance in QCoreApplication was deleted if there was pending update in the QSettings instance. Task-number: QTBUG-21421 Reviewed-by: Murray Read
| | * | | | | | Fix uninitialised variable in temporary filesShane Kearns2011-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbianFilePos variable was only initialised in the nativeOpen function and not in the constructor called init(). Due to the fix for QTBUG-4796, QTemporaryFile now bypasses the nativeOpen function. Zero initialising in init() ensures it is always valid (it only needs a non zero initialisation when opening a file for append, which is still covered by nativeOpen) Task-Number: QTBUG-21418 Reviewed-By: mread
| | * | | | | | 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
| | * | | | | Add documentation for Symbian QSettings locations and securityPasi Pentikainen2011-09-131-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11192 Reviewed-by: Miikka Heikkinen
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-133-1/+7
| | |\ \ \ \ \
| | | * | | | | Update QDesktopServices openUrl() documentation on Symbian OSJuha Kukkonen2011-09-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopServices openUrl() does not reload the given URL if browser is already open unless application has SwEvent capability. Capability is required because this scenario involves sending a message to window group in other process. Task-number: QTBUG-15725 Reviewed-by: Honglei Zhang
| | | * | | | | Mark binaries as SMPSAFE in SymbianPasi Pentikainen2011-09-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11769 Reviewed-by: Laszlo Agocs
| | | * | | | | Add a cast to moc cpp generator to remove armcc warningsPasi Pentikainen2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3869 Reviewed-by: Murray Read
| | * | | | | | QS60Style: Make spinboxes and lineedits slightly tallerSami Merila2011-09-081-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make spinboxes and lineEdits as tall as comboboxes are. This makes these components to look more like native components. Since spinbox frame width was previously zero, changing the value revealed some button positioning issues. Task-number: QT-4175 Reviewed-by: Miikka Heikkinen
| | * | | | | | Merge remote branch 'qt/4.8'Shane Kearns2011-09-0784-193/+1178
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Fix a bad merge of qs60style.cppSami Merila2011-09-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge cf2f72f4f61f3a9e0e7573379c33bb341eeba7be caused QS60Style.cpp to pick up unrelated changes from Qt4.7 branch. Reviewed-by: Miikka Heikkinen
| | * | | | | | Fix Coverity findings from QS60StyleSami Merila2011-09-022-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues found out by static analysis tool Coverity from QS60Style. Task-number: QT-4843 Reviewed-by: Miikka Heikkinen
| | * | | | | | Remove whitespace from S60 style codes.Miikka Heikkinen2011-09-022-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-12-28 03:16:13 (GMT)