summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-10-0414-88/+158
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs Fix assert Compile fix for Symbian Debugger: Fix autotest breakage Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug* Rename QDeclarativeEngineDebugServer to ~Service Fix aliasing bug when compiled with gcc 4.6 Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h FocusScope's focusItem must always be a descendent QDeclarativeDebugJs: Disable unstable autotest Add qdeclarativedebugjs autotests to declarative.pro tests: Use CONFIG option instead of QDeclarativeDebugHelper class
| * QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjsKai Koehne2011-09-291-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case a service is waiting for messages via waitForMessage, deliver all arriving messages to the service directly, not only the first one. In the case of QDeclarativeDebugJS::watchExpressions() test case, the first message is actually WATCH_EXPRESSIONS , followed by BREAKPOINTS. However, the second BREAKPOINTS command wasn't delivered directly, but queued in the main event loop. As soon as waitForMessage() was returning, QJSDebugClient was just calling waitForMessage() anew (because BREAKPOINTS wasn't delivered yet), blocking the main event loop from being run. Reviewed-by: Aurindam Jana
| * Fix assertAaron Kennedy2011-09-281-1/+1
| |
| * Compile fix for SymbianAaron Kennedy2011-09-211-4/+4
| |
| * Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-09-20727-9463/+21781
| |\
| | * Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*Kai Koehne2011-09-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c289bdf555aa317dc12c5dbcff0168ebcc7bd50 Reviewed-on: http://codereview.qt.nokia.com/3935 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> (cherrypicked from a07f68eff5ac4696a551f083d186a685f7ef043d)
| | * Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-167-58/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix the file names/location, too Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c Reviewed-on: http://codereview.qt.nokia.com/3890 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
| | * Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-155-12/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps don't have to (directly or indirectly) include qdeclarative.h. Instead, move the static instance to qdeclarativeengine.h, and qdeclarativeview.h (which instantiates it's own engine). Change-Id: I8b3e63ad4f134969734a2cc712395145d90e0dfa Reviewed-on: http://codereview.qt.nokia.com/3941 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> (cherrypicked from commit 6cb39fb829b78b5f6e9751283c7cd50400821e2a)
| * | Fix aliasing bug when compiled with gcc 4.6Aaron Kennedy2011-09-151-9/+16
| | | | | | | | | | | | Task-number: QTBUG-21265
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-10-041-13/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNetworkRequest autotest: adapt to new cookie parsing (re. commas) Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.
| * \ \ Merge branch '4.8' into earth-staging-masterSinan Tanilkan2011-09-21707-8960/+16426
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
| * | | | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2011-09-161-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also allows cookie values to contain commas to increase compatibility like most popular browsers do even though the RFC still reserves them for future uses. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: QTBUG-21456
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵v4.8.0-rc1Qt Continuous Integration System2011-10-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix possible crash in QFontEngineFT
| * \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2724-280/+2342
| |\ \ \ \ \
| * | | | | | Fix possible crash in QFontEngineFTEskil Abrahamsen Blomfeldt2011-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid crash if set pointer is null. Task-number: QTBUG-21647 Reviewed-by: Jiang Jiang
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-038-10/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added text about -random and -seed options in QTest to changelog Add another part of the source code to the snippet. Update changes-4.8.0 Update translation sources. Update the changelog for qdoc in 4.8
| * | | | | | Add another part of the source code to the snippet.Casper van Donderen2011-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-21765
| * | | | | | Update translation sources.Casper van Donderen2011-09-297-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Geir Vattekar
* | | | | | | 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)
| * | | | | | | | | | | Fix broken Solaris build (getpwnam_r usage)Iikka Eklund2011-09-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ifdef inside qt_tildeExpansion function to use correct version of getpwnam_r depending on _C_POSIX_SOURCE version on Solaris platform. Task-number: QTBUG-21451 Merge-request: 1380 Reviewed-by: ossi
* | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-01-20 23:47:04 (GMT)