summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge in changes to old kinetic-dui branch.Michael Brasser2009-04-234-8/+31
* Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-2223-144/+32
|\
| * 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
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-2228-421/+2194
|/ /
* | 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
| * compile with aCCOswald Buddenhagen2009-04-071-2/+2
| * Fixes: Support for OpenGL ES 2.0 in configure.exe (Windows CE)Thomas Hartmann2009-04-071-1/+13
* | Added copyright headers for the new QWS keymap handling filesRobert Griebl2009-04-071-0/+41
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-071-6/+6
|\ \ | |/
| * Merge commit 'ab56759cefbcf2072ac777f0d897e561f5a3c8af' into 4.5Joerg Bornemann2009-04-061-6/+6
| |\
| | * don't display warning message when calling checksdk -listJoerg Bornemann2009-04-011-6/+6
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-061-21/+14
|\ \ \ | |/ /
| * | Make the configure.exe program work for the commercial release licenses.Thiago Macieira2009-04-041-21/+14
* | | Keymap support for QWS.Robert Griebl2009-04-023-0/+962
* | | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
* | | don't lose codecForTr in c++ parserOswald Buddenhagen2009-04-021-1/+3
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0215-63/+171
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-021-9/+10
| |\ \
| | * | re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| | * | fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | * | fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| * | | fixes empty tab after pdf file open, new tab after middle mouse clickkh2009-04-022-3/+57