summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix buildWarwick Allison2010-02-153-6/+0
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-15425-7030/+3720
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1541-522/+719
| |\
| * \ Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-13383-4201/+2598
| |\ \
| | * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1342-2829/+1122
| |\ \ \
| | * | | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | * | | Some more refactoring.kh12010-02-1212-358/+462
| | * | | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| | * | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| | * | | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | * | | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| | * | | fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| | * | | purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| | * | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| | * | | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | * | | remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | * | | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | * | | simplifyOswald Buddenhagen2010-02-121-1/+1
| | * | | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| | | * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1323-78/+114
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-127-54/+94
| | | | |\ \
| | | | | * | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-124-43/+86
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-123-11/+8
| | | | | |\ \ | | | | |/ / /
| | | | | * | Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1216-24/+20
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
| | | | | |\ \ \
| | | | | | * | | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| | | | | |/ / / | | | | |/| | |
| | | | | * | | doc: Fixed several typos.Martin Smith2010-02-1212-20/+20
| | | | |/ / /
| | | * | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-12365-4133/+2491
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-112-13/+11
| | | | |\ \ \
| | | | | * | | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ...Simon Hausmann2010-02-111-3/+1
| | | | | * | | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | | | * | | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-112-5/+0
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-111-2/+4
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | Fixed the perl download link and description in docsMiikka Heikkinen2010-02-111-2/+4
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-111-1/+1
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | QXmlSchema: fix crash in schema parserPeter Hartmann2010-02-111-1/+1
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-113-9/+2
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | now really fix the message editor for dark backgroundsOswald Buddenhagen2010-02-113-9/+2
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-113-2/+103
| | | | |\ \ \ \
| | | | | * | | | Update Symbian DEF filesIain2010-02-103-2/+103
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-112-27/+21
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| | | | | * | | | Export a function to get dfb-surface from a pixmapAnders Bakken2010-02-101-0/+11
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1016-4/+60
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| | | | | * | | | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.Prasanth Ullattil2010-02-101-1/+5