summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0352-197/+644
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0252-197/+644
| |\
| | * Hide some more files from git-status.axis2010-07-022-0/+4
| | * 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-025-11/+26
| | * Fixed deployment locations for various profiles.axis2010-07-025-5/+8
| | * 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
| | * Support for "deploy" make target in SymbianMiikka Heikkinen2010-07-023-7/+17
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7mread2010-07-0297-506/+1643
| | |\
| | * | 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-0134-138/+540
| | |\ \
| | | * | 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-0132-129/+521
| | | |\ \
| | | | * | 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-0127-121/+338
| | | * | | QProgressDialog text is too close to dialog borderSami Merila2010-07-011-2/+9
| | | |/ /
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0115-688/+739
| | | |\ \
| | | * | | QFileDialog broken in landscape in N8Sami Merila2010-06-301-6/+9
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-029-4/+46
|\ \ \ \ \ \
| * | | | | | Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9Simon Hausmann2010-07-029-4/+46
| |/ / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-023-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Crash when dragging with mingwThierry Bastian2010-07-022-3/+4
| * | | | | Don't do alpha/opaque check which might cause a conversion and later pointer ...Michael Dominic K2010-07-021-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-029-11/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-025-3/+9
| |\ \ \ \
| | * | | | Designer: Fix compiler warnings.Friedemann Kleint2010-07-025-3/+9
| * | | | | qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-023-7/+10
| |/ / / /
| * | | | Fix compiler warning.Aaron McCarthy2010-07-021-1/+1
| * | | | Abort if connection to DBus cannot be established.Aaron McCarthy2010-07-021-0/+5
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-015-191/+147
|\ \ \ \
| * | | | Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-015-191/+147
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-017-24/+74
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10Simon Hausmann2010-07-017-24/+74
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0113-20/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | QSslSocket::systemCaCertificates(): have one common case for all UnicesPeter Hartmann2010-07-011-7/+4
| * | | | Fixed QX11EmbedContainer.Denis Dzyubenko2010-07-011-0/+1
| * | | | Improved a bit detection of a touch screen on Windows.Denis Dzyubenko2010-07-011-1/+6
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-017-7/+7
| |\ \ \ \
| | * | | | link glu32 before opengl32Oswald Buddenhagen2010-07-017-7/+7
| * | | | | qdoc: Fixed invalid format in the html header.Martin Smith2010-07-012-5/+12
| |/ / / /
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0114-686/+736
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-0176-271/+1466
|\ \ \ \ \ | |_|_|/ / |/| | | |