summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-10-044-53/+22
|\ | | | | | | | | | | | | | | 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.
| * QNetworkRequest autotest: adapt to new cookie parsing (re. commas)Peter Hartmann2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | Cookies cannot be separated by commas anymore, but are separated by new lines. See "Remove support for multiple cookies in one Set-Cookie header to follow RFC6265." Reviewed-by: Martin Petersson Task-number: QTBUG-21456
| * Merge branch '4.8' into earth-staging-masterSinan Tanilkan2011-09-21900-10385/+20604
| |\ | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
| * | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2011-09-163-52/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-2734-295/+2503
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (22 commits) Fix accessible menu not returning child name. Fix broken qglthreads autotest build on Solaris. Don't store the alignment attribute for spacers Update changelog for Qt-4.8.0: add QtWebKit notes Update changelog for Qt 4.8 Fix broken Solaris build (getpwnam_r usage) Improve sbsv2 whatlog support. Sentences should end with a period! (Poor man's rebuild trigger.) 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() Workaround MSVC2010 problems when linking QtWebKit dos2unix on a webkit source file (fix support for Visual Studio) ...
| | * \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2734-295/+2503
| | |\ \ \
| * | \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-261-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix possible crash in QFontEngineFT
| | * | | | 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-0310-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Added text about -random and -seed options in QTest to changelogMagne Zachrisen2011-09-301-0/+5
| | | | | | |
| * | | | | | Add another part of the source code to the snippet.Casper van Donderen2011-09-302-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-21765
| * | | | | | Update changes-4.8.0Jens Georg2011-09-291-0/+1
| | | | | | |
| * | | | | | Update translation sources.Casper van Donderen2011-09-297-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Geir Vattekar
| * | | | | | Update the changelog for qdoc in 4.8Casper van Donderen2011-09-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
* | | | | | | 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 git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-2223-245/+2362
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: 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 Fix the incorrect sizeHint given by QLabel on Symbian
| | * | | | | | | | | | Improve sbsv2 whatlog support.Miikka Heikkinen2011-09-223-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All builds will now add anything generated via QMAKE_EXTRA_COMPILERS to whatlog. In addition, platform builds will now add to whatlog the exported mkspecs and qmake_clean.flm that were missing. Task-number: QTBUG-21591 Reviewed-by: Sami Merila
| | * | | | | | | | | | 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
| | * | | | | | | | | | | Modified SymSQL documentation in sql-driver.qdoc according review commentsTimo Kauppinen2011-09-211-37/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
| | * | | | | | | | | | | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-213-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
| | * | | | | | | | | | | Documentation modifications for SymbianSQL added into sql-driver.qdocTimo Kauppinen2011-09-211-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | Symbian: Fix qmdiarea autotest regressionsMiikka Heikkinen2011-09-211-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some cases in qmdiarea test passed on 4.7 but failed on 4.8. A closer examination reveals that the cases are in any case invalid in Symbian and should be skipped like in WinCE and Mac. Task-number: QT-5254 Reviewed-by: Sami Merila
| | * | | | | | | | | | | Merge branch 'SchemaMemLeak'Honglei Zhang2011-09-2110-213/+218
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix memory leaks in schema validationHonglei Zhang2011-09-2110-213/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-09-09 07:39:07 (GMT)