summaryrefslogtreecommitdiffstats
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-221-1/+1
|\
| * Added an additional check to workaround an issue on Windows.David Boddie2011-08-221-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-1831-254/+438
|\ \ | |/
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-0125-238/+210
| |\
| | * 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: Removed whitespace.David Boddie2011-06-301-1/+0
| | * Modified \since command behavior slightly to handle project and version.David Boddie2011-06-309-202/+174
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-06-167-11/+217
| |\ \ | | |/
| | * Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-06-165-5/+209
| | * Doc: Added more appropriate links to help reduce confusion.David Boddie2011-06-161-0/+2
| | * Doc: Removed non-ASCII characters from the documentation.David Boddie2011-06-161-6/+6
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-06-098049-132636/+140679
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-06-092-5/+11
| | |\
| * | \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-162-5/+11
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-16339-2707/+30191
| | |\ \
| | * | | qdoc: Fixed QTBUG-19338Martin Smith2011-05-162-5/+11
* | | | | 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/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-171-2/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | fix copying webkit guide under windowsOswald Buddenhagen2011-08-171-2/+6
* | | | | | | 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-172-3/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix delayed password masking mid-string.Andrew den Exter2011-08-172-3/+10
* | | | | | | | 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-152-0/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Join user state of removed text blocksLeandro Melo2011-08-152-0/+19
* | | | | | | | 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/+9800
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Adding Persian translation of Qt.Soroush Rabiei2011-08-121-0/+9800
* | | | | | | | 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-qml into 4.7-integrationQt Continuous Integration System2011-08-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Revert accidental commitBea Lam2011-08-111-205/+91
| * | | | | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205