summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-248-37/+47
| | | | | | | | | | | | It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* Fix def file paths for Symbian shadow buildsMiikka Heikkinen2011-08-241-6/+10
| | | | | | | Def file paths are now generated absolute Task-number: QTBUG-10703 Reviewed-by: Sami Merila
* Giving QUuid::createUuid() more entropy on Symbianmread2011-08-241-0/+6
| | | | | | | | | | QUuid::createUuid() uuids have low entropy on Symbian, giving a dangerously high probability of collision. This change adds in more entropy from the kernel tick count to reduce the possibility of collision. Task-number: QTBUG-21072 Reviewed-by: Sami Merila
* Enable running of XQuery test suiteHonglei Zhang2011-08-2415-40/+133
| | | | | | | | | | Some xmlpatterns auto test cases are still using old script. And some small bugs in test driver prevent the XQuery test suite testing. This commit updated the out-of-date scripts and fixes couple of bugs in test driver. Task-number: QTBUG-16028 Reviewed-by: Dmitry Trofimov
* Merge branch 'xmlExtRefBuffer'Honglei Zhang2011-08-244-1/+23
|\
| * QXmlSimpleReader handle external entity reference file over 1kHonglei Zhang2011-08-244-1/+23
| | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug that causes the QXmlSimpleReader can only handle external reference file less than 1k. Instead of reading the 1k buffer, the system will try to read all data from file into memory. This is not good for memory management. But there doesn't seem to be better solution without breaking the existing API. Task-number: QTBUG-21025 Reviewed-by: Peter Hartmann
* | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-23218-3951/+19270
|\ \
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-194-8/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix non-ascii name issues in ICD. Compile fix for Symbian 5th and earlier fix copying webkit guide under windows Symbian: Fix backspace on empty lines of multiline textedits
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-184-8/+32
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-182-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix non-ascii name issues in ICD.
| | | | * | Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PMO Bug 275663. Developed by Aapo Makela, reviewed by me.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-181-2/+5
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Compile fix for Symbian 5th and earlier
| | | | * | | Compile fix for Symbian 5th and earlierSami Merila2011-08-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional fix to enable compilation of Qt GUI to succeed on earlier Symbian SDKs. Task-number: QTBUG-20033 Reviewed-by: Kalle Lehtonen
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-171-2/+6
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix copying webkit guide under windows
| | | | * | | fix copying webkit guide under windowsOswald Buddenhagen2011-08-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Rob Tomek. Task-number: QTBUG-19155
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-171-1/+18
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian: Fix backspace on empty lines of multiline textedits
| | | | * | | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-171-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backspace on empty lines of multiline textedits didn't work because in Symbian the virtual keyboard only gets one block of text at a time, and there is some internal optimization in FEP that if the document is empty, backspace doesn't get generated. Fixed by faking document lenght to be one in cases where it is actually zero, except for password fields with hidden text, as an extra asterisk would be generated in those cases. Typically password fields are not multiline so this shouldn't be a problem. Task-number: QTBUG-20444 Reviewed-by: Sami Merila
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-08-1949-167/+230
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
| | * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-1620-93/+121
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings.
| | | * | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-1519-90/+120
| | | | | | | | |
| | | * | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-4/+2
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-11243-22777/+52301
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (106 commits) Improved comment finding code. Added language information to the pure documentation parser. 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 ...
| | | * | | | | | Improved comment finding code.David Boddie2011-08-112-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid snippet markers and prevent accidental reuse of comments for different objects.
| | | * | | | | | Added language information to the pure documentation parser.David Boddie2011-08-112-0/+6
| | | | | | | | |
| | | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-08239-22753/+52254
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-082-4/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description.
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-08-083-33/+55
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
| | | | | | | | | | |
| | | * | | | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20398 (cherry picked from commit 88b4736d8085db27abbe54ac6ece86f9badf154a)
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-292-32/+54
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixes to Qt tutorial
| | | * | | | | | | | Doc: Fixes to Qt tutorialGeir Vattekar2011-07-292-32/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jerome Pasion
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-2820-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fixed external link to DevNet Wiki. Doc: Added a copy of the online style images for the qdoc manual.
| | | * | | | | | | | Fixed external link to DevNet Wiki.Jerome Pasion2011-07-281-1/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
| | | * | | | | | | Doc: Added a copy of the online style images for the qdoc manual.David Boddie2011-07-2019-0/+0
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-201-13/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Removed the Google Analytics script.
| | | * | | | | | | Doc: Removed the Google Analytics script.David Boddie2011-07-191-13/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-08-188-15/+36
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: uikit: Fixes for Open GL ES 1 and for pre-3GS devices uikit: Fix warning. Use thumb instructions for uikit Fix compilation with thumb2. Update uikit README: svg works, warn about thumb Fix bidi reordering of RTL text with embedded images Fixed infinite loop when loading certain SVGs.
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-176-12/+35
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: uikit: Fixes for Open GL ES 1 and for pre-3GS devices uikit: Fix warning. Use thumb instructions for uikit Fix compilation with thumb2. Update uikit README: svg works, warn about thumb
| | | * | | | | | | | | uikit: Fixes for Open GL ES 1 and for pre-3GS devicesEike Ziller2011-08-172-6/+27
| | | | | | | | | | | |
| | | * | | | | | | | | uikit: Fix warning.Eike Ziller2011-08-171-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Use thumb instructions for uikitEike Ziller2011-08-172-5/+4
| | | | | | | | | | | |
| | | * | | | | | | | | Fix compilation with thumb2.Eike Ziller2011-08-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16402 Rubber-stamped-by: Thiago Macieira
| | | * | | | | | | | | Update uikit README: svg works, warn about thumbEike Ziller2011-08-171-3/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-16156-5382/+23328
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (65 commits) Fix bidi reordering of RTL text with embedded images Join user state of removed text blocks HTTP internals: send password even if no username is set Adding Persian translation of Qt. Missed break of switch-case added Fix softkeys cleanup Always disconnect signals on aborted reply objects Avoid spurious detaching in QDir::to/fromNativeSeparators Use fromLocal8Bit for reversing toLocal8Bit Don't convert template's path separators again Changed if/if/else/if/eleven chain to switch Modulus of negative dividends is undefined or negative Fix warning when compiling with VS 2008 Re-introduce Q_GLOBAL_STATIC_INIT Fix clientRect usage in QWidgetPrivate::setGeometry_sys() Do not allow fullscreen/maximized windows to expand beyond client rect Do not modify window size for fullscreen windows in setGeometry_sys QmlInspector: Fix moc error Don't leak MouseEvents Fix race condition in processJobs() ...
| | | * | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-166-3/+9833
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-16150-5377/+13495
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the UBA, the object replacement character should be considered ON. There's no reason to special case its directionality, as the bidi algorithm will already have given it an implicit directionality. Task-number: QTBUG-20910 Reviewed-by: Lars
| | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fixed infinite loop when loading certain SVGs.
| | | * | | | | | | | | | | Fixed infinite loop when loading certain SVGs.Kim Motoyoshi Kalland2011-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16216 Reviewed-by: aavit
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-08-1822-87/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: test: Fix `tst_qfiledialog' in a namespaced build Fix files that don't end with a newline character tests: Skip `qaudioinput' tests if there is no audio backend available tests: fixed crash of tst_qdialog tests: fixed crash of tst_qdialog Fix QString compares to "" Add test case name and drop parentheses for -datatags option. Adding QTDIR validation in tst_symbols autotest Disabled benchmarks referring to private headers. Fixed compile of tst_qscriptextensionplugin on some Windows configurations 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