summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-243-3/+6
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-243-3/+6
* | Merge branch '4.5'Thiago Macieira2009-04-241-1/+1
|\ \ | |/
| * Change Qt version number to 4.5.2Thiago Macieira2009-04-247-11/+11
* | Remove the Direct3D engine.Gunnar Sletta2009-04-241-57/+2
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-233-68/+22
|\ \ | |/
| * cleanupkh2009-04-233-68/+22
* | Merge branch '4.5'Thiago Macieira2009-04-236-32/+57
|\ \ | |/
| * fixes open an empty page on invalid keywordkh2009-04-231-0/+2
| * make sure we wait until the page has fully loaded before duplicatingkh2009-04-233-1/+19
| * update the filter combobox if we set a passed filterkh2009-04-231-2/+11
| * use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-7/+0
| * Set the current filter if one gets passed by commandline.kh2009-04-231-0/+3
| * cleanup, normalized connect, etc...kh2009-04-231-24/+24
* | Make BGR mode configurable through the GUIPaul Olav Tvete2009-04-231-0/+2
* | Add BGR format to qvfbPaul Olav Tvete2009-04-233-1/+19
* | Adding 2bpp support to qvfbPaul Olav Tvete2009-04-233-864/+855
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-236-12/+10
|\ \ | |/
| * Make all qdoc footers consistent with the main Qt docs.Jason McDonald2009-04-226-12/+10
* | Remove git merge conflict markersSimon Hausmann2009-04-222-2/+0
* | Merge branch '4.5'Rhys Weatherley2009-04-2114-19/+15
|\ \ | |/
| * correct the HowTokh2009-04-211-3/+2
| * Fix incorrect year and version number in assistant docs.kh2009-04-211-0/+0
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-216-19/+19
| * QTableWidget header items not re-translated by QUiLoader.Friedemann Kleint2009-04-211-2/+2
| * BT: Remove turkish translation files created by previous change.Jason McDonald2009-04-215-5/+0
* | Merge branch '4.5'Thiago Macieira2009-04-203-15/+5
|\ \ | |/
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-202-8/+5
| * mac: remove special handling of the editor frame now that stylesheets work pr...Oswald Buddenhagen2009-04-201-7/+0
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-206-110/+12
|\ \ | |/
| * Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-186-110/+12
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-1721-117/+13
|\ \ | |/
| * Fix incorrect year and version number in assistant docs.Jason McDonald2009-04-171-2/+2
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-1721-116/+29
| |\
| | * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1Kavindra Devi Palaraja2009-04-161-1/+1
| | * Remove obsolete code.Jason McDonald2009-04-161-9/+1
| | * Remove obsolete pre-processor directives that check QT_VERSION.Jason McDonald2009-04-1616-96/+0
| * | Fix management of svg iconsJarek Kobus2009-04-172-9/+9
* | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-152-9/+26
|\ \ \ | | |/ | |/|
| * | protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| * | do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| * | fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| * | add some commentsOswald Buddenhagen2009-04-151-4/+4
| * | Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| |/
* | Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-159-18/+52
|\ \ | |/
| * Display QAction keyboard shortcuts in action editor correctly.Friedemann Kleint2009-04-155-13/+25
| * Fix typo.Morten Sørvig2009-04-141-1/+1
| * update/fix configureMaurice Kalinowski2009-04-082-3/+12
| * Don't check license for internal configurationsMarius Storm-Olsen2009-04-081-1/+2