summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-0920-166/+306
|\
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-1/+10
| |\
| | * Merge branch '4.6-s60' into 4.6axis2009-11-062-0/+5
| | |\
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-051-1/+1
| | | |\
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0415-43/+106
| | | |\ \
| | | * | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-042-0/+5
| | * | | | Make declarative support in configure.exe auto.Martin Jones2009-11-051-1/+5
| | | |_|/ | | |/| |
| * | | | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2
| * | | | Assistant: Fix bugs on cached collection file handling.ck2009-11-061-1/+7
| * | | | Assistant: Reset default homepage on collection file update.ck2009-11-051-0/+2
| * | | | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
| * | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0415-46/+107
| |\ \ \ \ | | |/ / /
| | * | | eval: add key for the installer to grep for.Daniel Molkentin2009-11-041-1/+1
| | | |/ | | |/|
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0413-24/+89
| | |\ \
| | | * \ Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-1/+1
| | | |\ \
| | | | * | Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+1
| | | | |\ \
| | | * | | | Declarative building infrastructure.Warwick Allison2009-11-042-0/+13
| | | * | | | qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| | * | | | | qdoc: Fixed XHTML breakage caused by the Google search bar markup.David Boddie2009-11-031-2/+2
| | |/ / / /
| * | | | | add -markuntranslated optionOswald Buddenhagen2009-11-043-16/+29
| * | | | | reshuffle command line parsingOswald Buddenhagen2009-11-041-16/+12
| * | | | | construct ConversionData earlierOswald Buddenhagen2009-11-041-31/+21
| * | | | | don't break on unterminated C commentsOswald Buddenhagen2009-11-041-1/+1
| * | | | | introduce delayed resolution of aliasesOswald Buddenhagen2009-11-041-16/+41
| * | | | | fix bogus "Class '<foo>' lacks Q_OBJECT macro"Oswald Buddenhagen2009-11-041-3/+3
| * | | | | namespaces can have parents, tooOswald Buddenhagen2009-11-041-5/+10
| * | | | | Fix Assistant to never access the network.kh12009-11-041-17/+15
* | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-098-90/+158
|\ \ \ \ \ \
| * | | | | | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-062-2/+5
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-067-88/+152
| |\ \ \ \ \ \
| | * | | | | | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-057-88/+152
| * | | | | | | Make tests with transparent QML reproducible.Warwick Allison2009-11-061-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-0511-34/+77
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove "to" limit on minor version.Warwick Allison2009-11-051-4/+4
| * | | | | | Fix 5f19daab6baba7d09853058355a66090a3781430Warwick Allison2009-11-041-5/+3
| * | | | | | Fix "initial" size for remote content.Warwick Allison2009-11-041-2/+2
| * | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-049-23/+68
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-16/+14
| | |\ \ \ \ \
| | | * | | | | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
| | * | | | | | Prepend qt_instdate when using configure.exe as well. Rebuilt configure.exeDaniel Molkentin2009-11-031-1/+1
| | | |_|_|_|/ | | |/| | | |
| | * | | | | disable link time code generation by default on Windows CEJoerg Bornemann2009-11-031-1/+0
| | * | | | | qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-11-031-1/+0
| | | |/ / / | | |/| | |
| | * | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-024-15/+34
| | |\ \ \ \
| | | * | | | Compilation failure QtOpenGL when Opengl ES is used on Qt for Windows CEKeith Isdale2009-11-021-0/+3
| | | * | | | Add a French translation to Assistant. Update the phrase book.Benjamin Poulain2009-10-302-0/+21
| | | * | | | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-0/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Tabs with corner widgets are drawn incorrectly in document mode on Mac.Prasanth Ullattil2009-10-291-0/+1
| | | | |/ /
| | | * | | Merge branch '4.6-s60' into 4.6axis2009-10-301-15/+9
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Removed mentions about certain flags being temporary for SymbianMiikka Heikkinen2009-10-291-13/+7