summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Renamed a tutorial image to avoid a clash with another image.David Boddie2011-02-032-1/+1
| | | | Task-number: QTBUG-17120
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-022-2/+2
|\
| * Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| |
| * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | | | | | | | Task-number: QTBUG-13799
* | Doc: Fixed a reference to the wrong image.David Boddie2011-02-021-2/+2
| | | | | | | | Task-number: QTBUG-17120
* | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| |
* | Doc: Renamed an image to ensure that it does not clash with another.David Boddie2011-02-021-0/+0
| | | | | | | | Task-number: QTBUG-17120
* | Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| |
* | Doc: Removed unnecessary HTML entity from the title.David Boddie2011-02-011-6/+6
| |
* | Doc: Fixed broken links to the old Symbian Foundation Wiki.David Boddie2011-02-011-2/+2
| | | | | | | | Task-number: QTBUG-17058
* | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-2813-23/+73
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-289-19/+66
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-268-15/+54
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix: define hotSpot for Gestures on Mac Fix warnings in PSQL driver: handle VersionUnknown in switch Fix warning in ODBC driver: passing NULL to non-pointer. QNAM FTP: switch to binary mode before sending a SIZE command Change the D-Bus signal filter to return NOT_YET_HANDLED for signals Check if the interpolators have already been deleted. Improve timer ID safety by using a serial counter per ID.
| | | * Fix: define hotSpot for Gestures on MacZeno Albisser2011-01-262-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no hotSpot defined for a gesture it cannot be propagated propperly within GraphicsView. Task-number: QTBUG-16618 Reviewed-by: Denis Dzyubenko
| | | * Fix warnings in PSQL driver: handle VersionUnknown in switchThiago Macieira2011-01-261-0/+6
| | | |
| | | * Fix warning in ODBC driver: passing NULL to non-pointer.Thiago Macieira2011-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | Warning was: passing NULL to non-pointer argument 7 of 'SQLRETURN SQLGetDiagRecW(SQLSMALLINT, void*, SQLSMALLINT, SQLWCHAR*, SQLINTEGER*, SQLWCHAR*, SQLSMALLINT, SQLSMALLINT*)'
| | | * QNAM FTP: switch to binary mode before sending a SIZE commandThiago Macieira2011-01-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With some servers, SIZE is not allowed in ASCII mode or it may return different sizes. Since we transfer in binary anyway, better get the size in binary too. Reviewed-by: Peter Hartmann
| | | * Change the D-Bus signal filter to return NOT_YET_HANDLED for signalsThiago Macieira2011-01-261-2/+3
| | | |
| | | * Check if the interpolators have already been deleted.Thiago Macieira2011-01-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During application destruction, the order in which static destructors is run is undetermined. So avoid a null-pointer dereference. Task-number: QTBUG-16855 Reviewed-by: Robin Burchell Patch by task reporter
| | | * Improve timer ID safety by using a serial counter per ID.Thiago Macieira2011-01-261-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The high bits of the counter are not used, so we store a serial counter there. This has nothing to do with the serial counter used in nextFreeTimerId, which is there for ABA protection. Reviewed-by: Bradley T. Hughes
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-261-4/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QComboBox popup incorrectly opened in Sym^3
| | | * | QComboBox popup incorrectly opened in Sym^3Sami Merila2011-01-261-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCombobox popup opens into incorrect position in Sym^3. This is due to that there is a new layout in use, where softkeys are positioned at the bottom. The current implementation just checks if native stacon component is in use and if not, puts the popup to left/right border of the application area (depending on UI direction). Task-number: QTBUG-16886 Reviewed-by: Miikka Heikkinen
| * | | | Doc: including missing pages in overviews.Morten Engvoldsen2011-01-283-0/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15357
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-27220-7174/+9682
| |\ \ \ \
| * | | | | Doc: Fixed typo in QCoreApplication docsGeir Vattekar2011-01-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14274
* | | | | | Doc: Adjusted the font sizes for the offline documentation.David Boddie2011-01-281-11/+10
| | | | | |
* | | | | | Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
* | | | | | Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| |/ / / / |/| | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
* | | | | Fixed whitespace.David Boddie2011-01-271-9/+9
| | | | |
* | | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-272-7/+5
|\ \ \ \ \
| * | | | | Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fall back to Qt if no product name is used.
| * | | | | Doc: Unindented a code snippet.David Boddie2011-01-271-1/+1
| | | | | |
* | | | | | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16875 Reviewed-by: Takumi ASAKI
* | | | | | Doc: Fixed a broken link.David Boddie2011-01-271-2/+2
| | | | | |
* | | | | | Doc: Updated the information about commercial editions of Qt.David Boddie2011-01-271-8/+31
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-26136-6189/+8163
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-263-0/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add util/xkbdatagen/README
| | * | | | Add util/xkbdatagen/READMEOlivier Goffart2011-01-263-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-261-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Application background is incorrect if app locked to landscape.
| | * | | Application background is incorrect if app locked to landscape.Sami Merila2011-01-261-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If application orientation has been locked to landscape and application is started out while device orientation is portrait, QS60Style draws the QPalette::background like device would be in landscape. Style is incorrectly following device orientation, when it should follow application orientation. As a fix, style follows now application orientation. As a bonus, unnecessary fullscreen QPixmap creation is avoided when rotating the device. Task-number: QTBUG-16816 Reviewed-by: Jani Hautakangas
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-2611-70/+383
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" add autotest for digest authentication QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-2511-70/+383
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" add autotest for digest authentication QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
| | * | | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-258-40/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from http://trac.webkit.org/changeset/56370 The old allocator caused QML to crash in MCL (TB10.1, week 1). Task-number: QTBUG-14293 Reviewed-by: Simon Hausmann
| | * | | Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"Kent Hansen2011-01-259-309/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7db489a0de073a2a56fe32d16f1cbe1bebdfd06d. The change to CollectorHeapIterator.h is not Symbian-specific and it introduced test failures on all platforms (tst_QScriptEngineAgent::positionChange_3()).
| | * | | add autotest for digest authenticationPeter Hartmann2011-01-251-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-15070
| | * | | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-259-44/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from http://trac.webkit.org/changeset/56370 The old allocator caused QML to crash in MCL (TB10.1, week 1). Task-number: QTBUG-14293 Reviewed-by: Simon Hausmann
| | * | | Improved performance of mapFromGlobal/mapToGlobal on X11Denis Dzyubenko2011-01-251-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't call XTranslateCoordinates anymore, but use the toplevel window offset that we already store to convert between screen coordinates and widget coordinates. Reviewed-by: João Abecasis
| | * | | Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivateDenis Dzyubenko2011-01-252-20/+32
| | | | | | | | | | | | | | | | | | | | Reviewed-by: João Abecasis
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-252-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Temporary fix for ambiguous cast from four letter char constant Fix QMAKE_POST_LINK in Symbian for targets with special characters.