summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-2421-5/+53
|\
| * Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2319-5/+49
| |\
| | * Fix compilation after the last change.Thiago Macieira2009-06-231-1/+2
| | * mark plural messages as such in the qm readerOswald Buddenhagen2009-06-231-0/+18
| | * add -input-codec option for qm readerOswald Buddenhagen2009-06-232-3/+10
| | * Fix missing member initialization.kh2009-06-2315-1/+16
| | * Fix crash in widget box when using load mode "LoadCustomWidgetsOnly"Eskil Abrahamsen Blomfeldt2009-06-221-0/+3
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+2
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-222-2/+0
|\ \ \ | |/ /
| * | qdoc: Fixed XHTML breakage again.David Boddie2009-06-221-2/+2
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-192-2/+0
| |\ \ | | |/
| | * Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-192-2/+0
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-06-191162-2711/+2918
|\ \ \
| * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-06-191-3/+5
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-191162-2711/+2918
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-1812-142/+209
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Make it possible to drag bookmarks to the root item.kh2009-06-181-1/+2
| | | * | Cleanup.kh2009-06-182-117/+99
| | | * | Add Russian translation for Qt Assistant.Ritt Konstantin2009-06-172-0/+2
| | | * | Add Russian translation for QtHelp.Ritt Konstantin2009-06-171-0/+1
| | | * | Add Russian translation for Qt Linguist.Ritt Konstantin2009-06-171-0/+1
| | | * | Update Russian phrase book.Ritt Konstantin2009-06-171-23/+104
| | | * | revert built-time qm generationOswald Buddenhagen2009-06-161-1/+0
| | | * | Blank out the Qt-3 area license headers in the qt3to4 resources.Morten Sørvig2009-06-164-0/+0
| | * | | qdoc: Fixed crash when a compact list section was empty.Martin Smith2009-06-181-24/+27
| | * | | Fix nasty qt3-qt4 porting trap: for a QStringList, lst.remove(lst.at(idx)) us...David Faure2009-06-181-2/+2
| | * | | Fixed an oversight in Qt Designer that prevents one from designing empty tab ...J-P Nurmi2009-06-171-5/+7
| | * | | Fixed an oversight in Qt Designer that prevents one from designing empty stac...J-P Nurmi2009-06-171-4/+7
| | * | | Update license headers in files that are new in 4.6.Jason McDonald2009-06-175-10/+10
| | * | | fix typoOswald Buddenhagen2009-06-161-1/+1
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-161-0/+10
| | |\ \ \
| | | * | | Store promoted Widgets correctly in the ScratchPad.Friedemann Kleint2009-06-161-0/+10
| | * | | | Merge license header changes from 4.5Volker Hilsheimer2009-06-161147-2288/+2320
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-1/+1
| | | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-161143-2272/+2310
| | | * | no point in ProFile being a QObjectOswald Buddenhagen2009-06-151-4/+1
| | | * | remove unused includesOswald Buddenhagen2009-06-152-2/+0
| | | * | remove pointless prisOswald Buddenhagen2009-06-151-2/+0
| | | * | We only need to filename, not the full path.kh2009-06-151-1/+1
| | | * | fix qm buildOswald Buddenhagen2009-06-151-0/+1
| | * | | purge dead codeOswald Buddenhagen2009-06-151-18/+4
| | * | | simplify ending()Oswald Buddenhagen2009-06-151-4/+3
| | * | | use textedit's signal instead of the textedit's document'sOswald Buddenhagen2009-06-151-4/+3
| | * | | centralize settingsOswald Buddenhagen2009-06-158-33/+128
| | * | | make the focus tracking insensitive to loss of actual window focusOswald Buddenhagen2009-06-154-26/+55
| | * | | greatly simplify exclusive selection handlingOswald Buddenhagen2009-06-154-73/+49
| | * | | make MessageEditor::activeEditor() & co. return a QTextEdit instead of aOswald Buddenhagen2009-06-152-37/+33
| | * | | don't let comments weaved into strings confuse usOswald Buddenhagen2009-06-151-1/+3
| | * | | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-127-51/+61
| | |\ \ \ | | | |/ /
| | | * | We do only support files inside or in subdirs of the help project.kh2009-06-111-45/+49