summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-133-0/+25
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Put Qt translation files to rom on Symbian.
| * Put Qt translation files to rom on Symbian.Pasi Pentikainen2011-10-133-0/+25
| | | | | | | | | | Task-Number: QTBUG-4919 Reviewed-by: Honglei Zhang
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-1022-67/+67
|\ \ | |/ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian Converting from double to qreal in gui
| * Fix QDeclarativeEngine::setOfflineStoragePath() for SymbianMiikka Heikkinen2011-10-101-1/+1
| | | | | | | | | | | | | | | | | | In Symbian, the sqlite database doesn't like mixing native and Qt separators in the database name, so ensure only native separators are used when declarative sets the database name. Task-number: QTBUG-20836 Reviewed-by: Sami Merila
| * Converting from double to qreal in guimread2011-10-1021-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a number of places in QtGui where doubles were used in expressions due to the use of floating point constants in the code. Many of these constants are now constructed as qreal, removing the use of double operations where unneeded. These changes have been limited to constants that have exactly the same value whether double or float, to ensure that precision errors are not introduced. This should not affect any of the desktop platforms where qreal is double. On Symbian, where qreal is float, appropriate autotests have been run. Task-number: QTBUG-4894 Reviewed-by: Sami Merila
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-103-1/+52
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix XML schema validation failure.
| * Fix XML schema validation failure.Juha Kukkonen2011-10-103-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking constraining facets for double failed if enumeration restriction had values INF or NaN. There were two issues that caused validation to fail: - wrong conversion function was used when constraining facets for double are checked, which caused values to be in lower case - case when both restriction and default value are NaN was not handled correctly Task-number: QTBUG-21375 Reviewed-by: Honglei Zhang
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-066-14/+194
|\ \ | |/ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix construction races in QtNetwork Removing accidental use of double instead of qreal from QLine
| * Fix construction races in QtNetworkShane Kearns2011-10-062-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When two threads construct a QNetworkAccessManager at exactly the same time on an SMP system, there are construction races for some Q_GLOBAL_STATIC data. This is normal and expected - the losing thread deletes its instance as part of the Q_GLOBAL_STATIC macro. However, for two of the classes, destruction of the loser had side effects. For QNetworkConfigurationMangerPrivate, there was a crash because of uninitialised variable on the losing side. For QNetworkAccessBackendFactoryData, a guard mechanism intended to prevent the data being reconstructed by destructors of other global static classes was being set by the loser. To fix this, the bool is changed to a QAtomicInt. In the normal case, it will have value 0->1 on startup and 1->0 on shutdown. In the race case, it will have values 0->1->2->1 on startup and 1->0 on shutdown. Task-Number: QTBUG-20343 Reviewed-By: mread
| * Removing accidental use of double instead of qreal from QLinemread2011-10-064-8/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLine contained a number of places where conversions and calculations were done as double where qreal should have been used instead. This is caused by the use of raw floating point literals. The fix is to construct the literals as qreal. The angle conversions are simplified to reduce the risk of a growing loss of precision from this change. On Symbian, where qreal is float, this gives a 5-10% performance improvement to the affected functions, as tested by a new benchmark test. The auto tests pass, these contain precision tests which indicates that there is no significant loss of precision with this change. On Windows, where qreal is double, this has no significant effect on performance. Task-number: QTBUG-4894 Reviewed-by: Shane Kearns
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-061-1/+1
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix incorrect QFileInfo permissions on windows
| * Fix incorrect QFileInfo permissions on windowsShane Kearns2011-10-061-1/+1
| | | | | | | | | | | | | | | | | | Requesting the write permission marked the read permission as known without having retrieved it. A subsequent request for read permission would return false. Task-Number: QTBUG-20714 Reviewed-By: mread
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-0510-56/+77
|\ \ | |/ | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Converting accidental use of doubles to qreal in declarative Copy and Cut are not available for some QML editors Ignore CcpuCan calls if input context is being destroyed
| * Converting accidental use of doubles to qreal in declarativemread2011-10-059-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | Declarative had a number of places where double operations were used instead of qreal, due to the use of double literals. These are now constructed as qreal literals so that qreal operations are used. This makes no difference where qreal is double. But on Symbian, qreal is float, and this give a performance boost for floating point intensive code. Task-number: QTBUG-4894 Reviewed-by: Martin Jones
| * Copy and Cut are not available for some QML editorsSami Merila2011-10-051-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy and Cut actions do not appear in fullscreen VKB menu when a QML TextEdit or TextInput element is focused and has selected text. This happens because input method queries for cursor and anchor position in QCoeFepInputContext::CcpuCanCut() return zero in this case. It is probably related to focus changes when the options menu pops up. When menu pops up from native keyboard, window containing the QML elements is set as non-active, therefore it loses focus widget, which in turn causes queries about cursor and anchor positions to return zero. As a workaround, when there is no microfocus available, ask the "selectedText" property directly from QML elements. Task-number: QTBUG-21568 Reviewed-by: Miikka Heikkinen
| * Ignore CcpuCan calls if input context is being destroyedSami Merila2011-10-051-0/+5
| | | | | | | | | | | | | | | | If input context is being destroyed while its ability to paste/copy/cut is inquired from native side, just return false. This makes application exit somewhat faster. Reviewed-by: Miikka Heikkinen
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-051-2/+0
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Remove one local variable from QCoeFepInputContext
| * Remove one local variable from QCoeFepInputContextSami Merila2011-10-051-2/+0
| | | | | | | | | | | | Remove hasText variable as it is not used anywhere. Reviewed-by: Miikka Heikkinen
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-042-3/+9
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian: Fix native dialog with splitscreen VKB focus loss issue
| * Symbian: Fix native dialog with splitscreen VKB focus loss issueMiikka Heikkinen2011-10-042-3/+9
| | | | | | | | | | | | | | | | | | | | | | If a native input dialog that utilized splitscreen VKB was opened while focus was on QML TextEdit element, the focus would not be restored to QML TextEdit element after native dialog was closed. This happened because the KSplitViewCloseEvent came after FocusChanged, as the focus changes are ignored while splitview VKB is open. Task-number: QTBUG-21733 Reviewed-by: Sami Merila
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-047-9/+102
|\ \ | |/ | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication runonphone - Implement CODA autodetection
| * Create auto test for http HEAD requestShane Kearns2011-10-043-0/+65
| | | | | | | | | | | | | | | | | | This is in order to have a regression test for QT-5304. However the test is also checking basic functionality of head requests too. Task-Number: QT-5304 Reviewed-By: Martin Petersson
| * QNAM - fix poor performance of HEAD request with authenticationShane Kearns2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttpNetworkReply was waiting for a body to be sent for 401 and 407 responses, whereas with a HTTP HEAD request, there will be no body. This delayed the authentication signal until after the http channel is closed by the server after a timeout. For example with the server used for autotesting, the authentication signal is delayed 15 seconds. When the server has a very long timeout, the authentication signal may not be emitted at all. Task-Number: QT-5304 Reviewed-By: Martin Petersson
| * runonphone - Implement CODA autodetectionShane Kearns2011-10-043-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If runonphone is executed without specifying the debug agent, then it will attempt to autodetect it by sending a CODA ping to the USB port. If there is a reply within 1 second, then CODA mode is used. If not, then TRK mode is used. TRK drops unrecognised messages, so the CODA ping is ignored and initialisation starts normally when the TRK ping is sent. Autodetect can be skipped by using the --coda or --trk arguments on the command line to force use of a specific debug agent. Reviewed-By: mread
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-0323-155/+282
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (28 commits) Symbian: Parse ts filenames case-insensitively for localize_deployment Do not crash in copy() of pixmaps without an underlying bitmap QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8 Doc updates to Qt for Symbian installation instructions and platform notes. Doc updates to platform notes document. Fix accessible menu not returning child name. Fix broken qglthreads autotest build on Solaris. Doc updates to platform notes of Qt 4.8 doc. Disabled activeqt/webbrowser example from mingw build. Don't store the alignment attribute for spacers Doc updates to Qt 4.8 platform notes documentation. Update changelog for Qt-4.8.0: add QtWebKit notes Update changelog for Qt 4.8 Fix broken Solaris build (getpwnam_r usage) Sentences should end with a period! (Poor man's rebuild trigger.) Update changes-4.8.0 file Only limit cursor position when line is wrapped Workaround MSVC2010 problems when linking QtWebKit dos2unix on a webkit source file (fix support for Visual Studio) Update changelog for Qt 4.8 ...
| * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-0318-112/+247
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-282-36/+93
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc updates to Qt for Symbian installation instructions and platform notes. Doc updates to platform notes document. Doc updates to platform notes of Qt 4.8 doc. Doc updates to Qt 4.8 platform notes documentation.
| | | * Doc updates to Qt for Symbian installation instructions and platform notes.Eero Hyyti2011-09-272-20/+43
| | | |
| | | * Doc updates to platform notes document.Eero Hyyti2011-09-271-2/+17
| | | |
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingEero Hyyti2011-09-271-0/+9
| | | |\
| | | * | Doc updates to platform notes of Qt 4.8 doc.Eero Hyyti2011-09-231-6/+12
| | | | |
| | | * | Doc updates to Qt 4.8 platform notes documentation.Eero Hyyti2011-09-231-15/+28
| | | | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-09-271-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Disabled activeqt/webbrowser example from mingw build.
| | | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-09-23117-3490/+4498
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (84 commits) Disabled activeqt/webbrowser example from mingw build. Fix broken Solaris build (getpwnam_r usage) Sentences should end with a period! (Poor man's rebuild trigger.) Workaround MSVC2010 problems when linking QtWebKit dos2unix on a webkit source file (fix support for Visual Studio) Update changelog for Qt 4.8 add 4.8 changes created/merged by me Fixed automatic plugin path resolving for predefined Qt plugins. Resolve a number of compilation issues with INTEGRITY runonphone: Include USB serial ports on OS X for CODA, too Update changelog for Qt 4.8.0 Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE Update changelog for Qt 4.8 QGraphicsWidget::setLayoutDirection doesn't propagate to new children Update changelog for Qt 4.8 Prevent unnecessary graphics item updates when graphics effect changes. Updated change-log for 4.8 Update changes file for 4.8.0 Update changelog for Qt 4.8 runonphone: Implement traceswitch support for coda ...
| | | | * | | Disabled activeqt/webbrowser example from mingw build.Simo Fält2011-09-231-0/+3
| | | | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-09-278-14/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-22149-3680/+4533
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (95 commits) Update changes-4.8.0 file Only limit cursor position when line is wrapped Update changelog for Qt 4.8 add 4.8 changes created/merged by me Fixed automatic plugin path resolving for predefined Qt plugins. Resolve a number of compilation issues with INTEGRITY runonphone: Include USB serial ports on OS X for CODA, too Update changelog for Qt 4.8.0 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 Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE 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 Update changelog for Qt 4.8 Update changelog for Qt 4.8 Updated change-log for 4.8 Update changes file for 4.8.0 Update changelog for Qt 4.8 ...
| | | | * | | | | Update changes-4.8.0 fileaavit2011-09-221-1/+1
| | | | | | | | |
| | | | * | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2264-3250/+3774
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | * | | | | | 4.8 Changes: OpenGL Framebuffer FormatGerhard Roethlin2011-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an entry for the OpenGL Framebuffer Format commit to the 4.8 changelog. Merge-request: 1387 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-2626-246/+2417
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-262-2/+19
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix broken qglthreads autotest build on Solaris. Don't store the alignment attribute for spacers
| | | * | | | | | | | | | Fix broken qglthreads autotest build on Solaris.Iikka Eklund2011-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qglthreads autotest can not find usleep() function when compiling on Solaris platform. Added qplatformdefs.h include to fix compilation. Task-number: QTBUG-21594 Merge-request: 1394 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2025-09-12 08:45:35 (GMT)