summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-2214-17/+17
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Doc: Fixing typo
| * Doc: Fixing typoSergio Ahumada2011-08-1714-17/+17
| | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-171-0/+2
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: test: Fix `tst_qfiledialog' in a namespaced build
| * test: Fix `tst_qfiledialog' in a namespaced buildSergio Ahumada2011-08-151-0/+2
| | | | | | | | Reviewed-by: Pierre Rossi
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-1218-23/+23
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Fix files that don't end with a newline character
| * Fix files that don't end with a newline characterSergio Ahumada2011-08-1218-23/+23
| | | | | | | | | | | | | | | | These are cosmetic changes to files that do not end with a newline character. Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a Reviewed-by: Rohan McGovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-111-63/+70
|\ \ | |/ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: tests: Skip `qaudioinput' tests if there is no audio backend available tests: fixed crash of tst_qdialog
| * tests: Skip `qaudioinput' tests if there is no audio backend availableSergio Ahumada2011-08-111-63/+70
| | | | | | | | | | | | | | | | This code was always passing when no audio backend was available, skip the tests in this case instead. Change-Id: I4c0060ff144fa497a21823ffcab101ff68b84e17 Reviewed-by: Rohan McGovern
| * tests: fixed crash of tst_qdialogRohan McGovern2011-08-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | This test assumed that C++ exceptions could always be caught by the event loop. This is not the case when the Glib event loop is used. Skip the relevant portion of the test in that case. Change-Id: I2ad83386025a98f6c32202700c97e04ef3dff343 Reviewed-by: Kalle Lehtonen Reviewed-by: Sergio Ahumada (cherry picked from commit 569cd194d20e61d35768b210b4351f4eeb5c1ef8)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-111-0/+16
|\ \ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: tests: fixed crash of tst_qdialog
| * | tests: fixed crash of tst_qdialogRohan McGovern2011-08-111-0/+16
| |/ | | | | | | | | | | | | | | | | | | | | | | This test assumed that C++ exceptions could always be caught by the event loop. This is not the case when the Glib event loop is used. Skip the relevant portion of the test in that case. Change-Id: I2ad83386025a98f6c32202700c97e04ef3dff343 Reviewed-by: Kalle Lehtonen Reviewed-by: Sergio Ahumada (cherry picked from commit 569cd194d20e61d35768b210b4351f4eeb5c1ef8)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-0816798-1097710/+2281538
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (784 commits) Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Remove DerivedSources.pro from WebKit. Support debuggable in the makefile build system QLabel documentation: add warning about sanitizing input runonphone: fix failure to terminate Fix license headers in new files from coda patch runonphone: command line args improperly passed to TRK after CODA patch Mark all Symbian debug binaries debuggable by default Preventing QSoftkeyManager giving false positive memory leaks Detect linked fonts by name (insead of via CLinkedTypeface* Api) Fixed memory leak in QMessageBox::setInformativeText in Symbian Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Fix gamma corrected source color in GL Make macdeployqt more robust against usage of symbolic links. Memory leak fix in Symbian open file dialog Revert binary search in QTextEngine::findItem Runonphone with CODA support ...
| * \ Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-08109-2276/+7272
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-08-0444-1953/+4943
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: runonphone: fix failure to terminate Fix license headers in new files from coda patch runonphone: command line args improperly passed to TRK after CODA patch Preventing QSoftkeyManager giving false positive memory leaks Fixed memory leak in QMessageBox::setInformativeText in Symbian Memory leak fix in Symbian open file dialog Runonphone with CODA support Memory leak fix for Symbian menus Eabi DEF file sync between Qt 4.7 and 4.8 Winscw DEF file sync between Qt 4.7 and 4.8
| | | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-08-04593-38351/+55799
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (217 commits) Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Remove DerivedSources.pro from WebKit. Support debuggable in the makefile build system QLabel documentation: add warning about sanitizing input runonphone: fix failure to terminate Fix license headers in new files from coda patch runonphone: command line args improperly passed to TRK after CODA patch Mark all Symbian debug binaries debuggable by default Preventing QSoftkeyManager giving false positive memory leaks Detect linked fonts by name (insead of via CLinkedTypeface* Api) Fixed memory leak in QMessageBox::setInformativeText in Symbian Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Fix gamma corrected source color in GL Make macdeployqt more robust against usage of symbolic links. Memory leak fix in Symbian open file dialog Revert binary search in QTextEngine::findItem Runonphone with CODA support ...
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-0413-146/+146
| | | | |\
| | | | | * runonphone: fix failure to terminateShane Kearns2011-08-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the serial port is always completing with no error and zero bytes read. In this case, runonphone would not shut down properly as the terminate file descriptor was never read. Reviewed-By: mread
| | | | | * Fix license headers in new files from coda patchShane Kearns2011-08-028-137/+137
| | | | | |
| | | | | * runonphone: command line args improperly passed to TRK after CODA patchShane Kearns2011-08-021-1/+1
| | | | | |
| | | | | * Preventing QSoftkeyManager giving false positive memory leaksmread2011-08-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSoftkeyManager has a global static instance that was not being deleted on app exit. This global static instance can own other objects, the number of which grow with use up to a limit. This gives the appearance of a memory leak when the app exits and you see increasing heap cell counts. The change is to use a QScopedPointer to clean up the static on app exit. Reviewed-by: Miikka Heikkinen
| | | | | * Fixed memory leak in QMessageBox::setInformativeText in Symbianmread2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian implementation of QMessageBox::setInformativeText was taking the text from a QLabel and using it in a QTextBrowser, leaving the QLabel un-parented and therefore leaking. This is fixed by setting the QMessageBox as the QLabel's parent Task-number: QTBUG-20622 Reviewed-by: Miikka Heikkinen
| | | | * | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-0463-321/+2272
| | | | |\ \ | | | |_|/ / | | |/| | / | | | | |/
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-08-033-23/+40
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Fix gamma corrected source color in GL
| | | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-032-5/+10
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c.
| | | | * | | Fixed compile error in qwindowsurface_qws.cpp.Samuel Rødal2011-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20713 Reviewed-by: Jørgen Lind
| | | | * | | Fixed regression introduced by 5842d19cf3dff37a85c.Samuel Rødal2011-08-031-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need a normalized rectangle. Reviewed-by: aavit
| | | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-011-18/+30
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix gamma corrected source color in GL
| | | | * | | Fix gamma corrected source color in GLJiang Jiang2011-07-291-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL_EXT_framebuffer_sRGB expects linear RGB as input color, thus we need to convert sRGB based input color into linear RGB first before using glBlendColor with it. Task-number: QTBUG-20574 Reviewed-by: Samuel Rødal
| | * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-033-21/+9
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Remove DerivedSources.pro from WebKit. Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default Detect linked fonts by name (insead of via CLinkedTypeface* Api)
| | | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-032-0/+7
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-021-107/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove DerivedSources.pro from WebKit.
| | | | | * | | | | Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This .pro file gets processed by qmake while looking recursively for pro files. This may cause warnings and the file isn't necessary since derived sources have to be pre-generated before importing WebKit into src/3rdparty. Reviewed-by: Benjamin Poulain
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-022-0/+7
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default
| | | | | * | | | | | Support debuggable in the makefile build systemLiang Qi2011-08-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20697 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
| | | | | * | | | | | Mark all Symbian debug binaries debuggable by defaultMiikka Heikkinen2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CODA 4.1.* cannot be used to debug binaries that do not have DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all projects by default. Adding this keyword has no impact for previous versions of CODA or TRK. Task-number: QTBUG-20669 Reviewed-by: Shane Kearns
| | | * | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-08-0355-271/+2160
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-021-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QLabel documentation: add warning about sanitizing input
| | | * | | | | | | | | QLabel documentation: add warning about sanitizing inputPeter Hartmann2011-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make users more aware of QLabel guessing the text format. Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-08-022-2/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Don't include qdbusvirtualobject header twice.
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-01284-29670/+42335
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (59 commits) Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Revert binary search in QTextEngine::findItem Remove a duplicate include line Save previous font engine for right bearing adjustment Symbian^3 workaround: Avoid usage of linked fonts. Make it possible to update a related table after an external update Fix compilation under OSX 10.7 or using llvm-gcc. Add test case name and drop parentheses for -datatags option. Adding QTDIR validation in tst_symbols autotest Disabled benchmarks referring to private headers. Add license header to printdatatags autotests Compile on symbian^3 Compile on Symbian^3. Added -datatags option to QTestLib Fixed failure of tst_qxmlquery::evaluateToReceiver Fix typo in QFontDialog docs Reset previousGlyph once we reached a new text item Build Qt for Symbian on Mac/gcce again ...
| | | | * | | | | | | | | | Revert "fix QFileInfo::isSymLink() for NTFS mount points"Jiang Jiang2011-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.
| | | | * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-296-31/+88
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix typo for ifdef QT_NO_ACCESSIBILITYFrederik Gladhorn2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | | | | | | | | | | Call QAccessible::updateAccessibility when a widget is deletedJosé Millán Soto2011-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1310 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | | | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-272-2/+57
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2622-9/+366
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-252-6/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-232-2/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-227-13/+99
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-21198-9966/+275
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-10-26 23:30:38 (GMT)