summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-05217-8797/+5976
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-051-3/+3
| |\
| | * <br/> shouldn't trigger a new format range in QDeclarativeStyledText.Michael Brasser2010-07-051-1/+3
| | * Optimize QDeclarativeStyledText.Michael Brasser2010-07-051-2/+0
| * | Work around QTBUG-11929Warwick Allison2010-07-051-1/+2
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0416-49/+78
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0316-49/+78
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0316-49/+78
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0216-49/+78
| | | | |\
| | | | | * Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
| | | | | * docs - fix doc links, minor improvementsBea Lam2010-07-021-14/+24
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-029-29/+38
| | | | | |\
| | | | | | * Fix TextInput text getting improperly clippedJoona Petrell2010-07-022-19/+28
| | | | | | * fix doc linksBea Lam2010-07-027-8/+9
| | | | | | * Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-021-2/+1
| | | | | * | Make autotests work with qreal == float (in addition to double).Warwick Allison2010-07-023-4/+4
| | | | | * | Don't accept *files* that exist when *directory* is required.Warwick Allison2010-07-021-2/+4
| | | | | |/
| * | | | | make image handler includes privateOswald Buddenhagen2010-07-0418-32/+32
| * | | | | fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| * | | | | doc improvementsOswald Buddenhagen2010-07-031-5/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0335-368/+410
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0235-368/+410
| | |\ \ \ \
| | | * | | | Consolidate zlib configuration redundancyMark Brand2010-07-026-64/+21
| | | * | | | Fixed whitespace formattingMark Brand2010-07-021-55/+57
| | | * | | | Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-024-5/+120
| | | * | | | Split image handler plugin project filesMark Brand2010-07-0223-206/+202
| | | * | | | No explicit link to zlib/jpeg for system mng/tiffMark Brand2010-07-022-19/+14
| | | * | | | Removed stray line continuationsMark Brand2010-07-021-4/+2
| | | * | | | Long live else!Mark Brand2010-07-021-4/+4
| | | * | | | Fixed size hint for combo box on windowsJens Bache-Wiig2010-06-112-25/+4
| | | | |/ / | | | |/| |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0341-177/+595
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0241-177/+595
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | | * | | Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-022-2/+2
| | | * | | Fixed deployment locations for various profiles.axis2010-07-023-3/+6
| | | * | | Added a top-level runonphone target for Qt and QtWebKit.axis2010-07-021-0/+11
| | | * | | QS60Style: Simplify QMenu drawingSami Merila2010-07-021-35/+32
| | | * | | QS60Style: Remove gap from QProgressDialogSami Merila2010-07-021-0/+5
| | | * | | ColorDialog is incorrectly positionedSami Merila2010-07-021-2/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7mread2010-07-0261-284/+1067
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | qtguiu.def merge conflict fixmread2010-07-022-44/+119
| | | * | | Fix for include "private/qt_s60_p.h" in non-symbian buildsmread2010-07-011-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0133-136/+538
| | | |\ \ \
| | | | * | | Making orbit input methods work with Qt apps with -no-s60mread2010-07-011-2/+2
| | | | * | | Using the remaining valid data to construct the QTime object when msec parsin...Liang Qi2010-07-011-1/+1
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0131-127/+519
| | | | |\ \ \
| | | | | * | | fix for broken input method loadingmread2010-07-011-1/+1
| | | | | * | | Avkon Removal DEF file updatesmread2010-07-012-2/+46
| | | | | * | | Stub version of QS60Stylemread2010-07-013-6/+137
| | | | | * | | Avkon removal configured with -no-s60mread2010-07-0126-119/+336