summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
|
* qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-133-2/+10
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-111-21/+7
| |\
| * | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-18679
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-073-50/+184
| |\ \
| * | | Ensured that incomplete downloads are removed.David Boddie2011-04-072-1/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-18509
* | | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| |_|/ |/| | | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard.
* | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| |/ |/|
* | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| |
* | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| |
* | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| |
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-071-1/+3
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-064-24/+25
| |\
| * | Aim to fix Windows builds.David Boddie2011-04-051-1/+3
| | |
* | | qdoc: Updated the QDoc manual.Martin Smith2011-04-072-39/+128
| |/ |/|
* | qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| |
* | qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
|/
* Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0580-408/+1129
|\
| * qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-0510-48/+153
| | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed.
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-0118-87/+106
| |\
| | * Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-014-6/+8
| | | | | | | | | | | | | | | | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-315-24/+35
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-311-15/+19
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QSoftkeyManager auto test update
| | | | * QSoftkeyManager auto test updateTitta Heikkala2011-03-301-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated correct values to simulateSymbianCommand function calls. It is defined in QSoftKeyManagerPrivateS60 that left and right softkeys are 0 and 2, now these values are used in test also. The signal spy actions have been updated to track the correct button in checkSoftkeyEnableStates-function. Task-number: QTBUG-18375 Reviewed-by: Sami Merila
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-304-9/+16
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Corrected case mismatch. Fixed pro file syntax in demos/spectrum Fix for failing autotest QToolBar/Symbian Removed useless Exit button in Symbian^3
| | | | * Corrected case mismatch.axis2011-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | | * Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Daniel Teske
| | | | * Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into ↵Sami Merila2011-03-29679-16869/+33989
| | | | |\ | | | | | | | | | | | | | | | | | | merge-requests/2584
| | | | | * Removed useless Exit button in Symbian^3Titta Heikkala2011-03-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian^3 clearing softkeys with -1 value resulted useless Exit button. EAknSoftkeyEmpty is used instead to remove the extra button. There is no flickering with softkeys when using EAknSoftkeyEmtpy with Symbian^3. Task-number: QT-4557 Reviewed-by: Sami Merila
| | | | * | Fix for failing autotest QToolBar/SymbianSami Merila2011-03-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style was calculating the minimum size of a toolbutton inside a toolbar based on number of visible buttons. Of course, when the non-visible buttons become visible and we are limiting the toolbar width to screen width it fails (since the orginally visible button is already claiming to take whole width of toolbar and now-visible button is taking half the button width). As a fix, calculate minimum size based on number buttons only, irregardless of their visibility. Task-number: QTBUG-17777 Reviewed-by: Miikka Heikkinen
| | * | | | Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-301-25/+71
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-309-51/+57
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-304-44/+29
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Return correct boundaries reasons from QTextBoundaryFinder. GridView jumps to beginning of list when resized
| | | | * | | | Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-303-43/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The next character after a boundary is at pos, not pos + 1. Also consider whether the previous and next character are whitespace in combination when determing word boudaries otherwise positions between whitespace characters will return both StartWord and EndWord. And since there's no need to look ahead one character don't shortcut` the regular logic for the boundary before the last character. Change-Id: I2efbf3947066767945f96bf8456ef518d2149191 Task-number: QTBUG-11365 Reviewed-by: Denis Dzyubenko Reviewed-by: Ritt Konstantin
| | | | * | | | GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by RTL changes. The list position should only be reset when the view is completely regenerated, e.g. when the orientation changes. Change-Id: I748333529c113d95eaebfb8ac9bb9cf543413d3b Task-number: QTBUG-18441 Reviewed-by: Bea Lam
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-291-1/+11
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoLivePixmapData: Verify dimensions of locked pixmap
| | | | * | | | | QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a switch from HW rendering to SW rendering is done, all EGL surfaces backing a live pixmap become invalid because EGL is terminated. Thanks to a recent patch, all live images are now automatically invalidated when SW rendering is activated. Even with this mechanism in place, it is possible for the underlying EGL surface to be different than what the live pixmap is expecting. This can happen, for instance, if the X pixmap gets destroyed and a different X drawable is created using the same XID. Even though this is an unlikely scenario, it can result in a complete system failure if the surface dimensions do not match and the live pixmap user ends up writing over internal graphics driver structures. This patch adds a safeguard which disallows locking EGL surfaces with non-matching dimensions. Fixes Harmattan bug NB#237138. Merge-request: 2583 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-284-6/+17
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update changes for 4.7.3 directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
| | | | * | | | | | Update changes for 4.7.3Timo Turunen2011-03-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | | | | directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2558 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| | | | * | | | | | fix -enable-stdcall-fixup usageMark Brand2011-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the leading "-Wl," was apparently accidentally split off to the wrong line. Originally done in 0953ee3 for mkspecs/win32-g++. Merge-request: 1154 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | * | | | | | Report that an update is needed if no update was doneThiago Macieira2011-03-281-1/+1
| | | | | | | | | |
| * | | | | | | | | qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-3079-416/+1603
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Moved a couple of links into one list.Jerome Pasion2011-03-291-3/+1
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-297-110/+582
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-2950-212/+675
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |