summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...v4.7.4Qt Continuous Integration System2011-08-233-2/+338
|\
| * Fix problem with grabWindow on Mac OS X 10.6 with CocoaAndy Shaw2011-08-221-3/+2
| * don't crash when destroying childrenKonstantin Ritt2011-08-221-1/+2
| * Fix compile issue with Mac OS X 10.5Andy Shaw2011-08-191-2/+8
| * Fix QPixmap::grabWindow() on Mac OS X LionAndy Shaw2011-08-191-1/+27
| * Update 4.7.4 changesTimo Turunen2011-08-191-0/+304
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-225-19/+59
|\ \
| * | Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilterSami Merila2011-08-221-4/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Mrudul Pendharkar2011-08-222-7/+40
| |\ \
| | * | Exact word bubble doesn't disappear when screen is tapped (fix part 2)Sami Merila2011-08-192-4/+11
| * | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-163-11/+48
* | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /