summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-1816-35/+38
|\
| * Doc: Clarified the range of return values from QLineF::angle().David Boddie2011-06-301-2/+3
| * Doc: Fixed \since declarations.David Boddie2011-06-301-2/+2
| * Doc: Standardized on QtQuick for \since declarations.David Boddie2011-06-3013-31/+31
| * Doc: Added more appropriate links to help reduce confusion.David Boddie2011-06-161-0/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-181-0/+4
|\ \
| * | Exact word bubble doesn't disappear when screen is tappedSami Merila2011-08-181-0/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-182-3/+3
|\ \ \
| * | | Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-181-2/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Compile fix for Symbian 5th and earlierSami Merila2011-08-181-2/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-1/+18
|\ \ \ \ | |/ / /
| * | | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-171-1/+18
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-3/+5
|\ \ \ \ | |/ / /
| * | | Handle CloseSoftwareInputPanel event in QCoeFepInputContextSami Merila2011-08-171-3/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-171-3/+3
|\ \ \ \
| * | | | Fix delayed password masking mid-string.Andrew den Exter2011-08-171-3/+3
| * | | | Revert accidental commitBea Lam2011-08-111-205/+91
| * | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-161-4/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | don't crash when destroying codec listOswald Buddenhagen2011-08-151-4/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-161-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Disabled splitscreen translation still moves screenSami Merila2011-08-161-2/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-151-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-121-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Missed break of switch-case addedViktor Kolesnyk2011-08-121-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-122-3/+24
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix softkeys cleanupMiikka Heikkinen2011-08-121-2/+12
| * | | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-111-1/+1
| * | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-111-7/+9
| * | | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-111-1/+10
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-082-2/+2
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-082-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-058-12/+32
|\ \ \ \ | |/ / /
| * | | Fix compile errors on S60 3.2Shane Kearns2011-08-056-11/+11
| * | | Fix to QGLWidget rendering with VG graphics systemJani Hautakangas2011-08-052-1/+21
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-041-3/+3
|\ \ \ \ | |/ / /
| * | | Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-041-2/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-041-2/+6
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-08-03127-52415/+26133
|\ \ \ \
| * | | | Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| * | | | Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| * | | | Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-021-107/+0
|\ \ \ \ \
| * | | | | Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-021-21/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-281-12/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |