summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2010-01-0529-755/+4397
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-0529-755/+4397
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-2220-0/+4419
| | |\
| | | * Fixed incorrect headers.axis2009-12-2218-252/+474
| | | * Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-2120-0/+4197
| | * | Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was bein...Carlos Manuel Duclos Vergara2009-12-217-794/+4
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-181-3/+3
| | |\ \ | | | |/ | | |/|
| | | * doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-181-3/+3
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2009-12-172-3/+16
| | |\ \ | | | |/ | | |/|
| | | * Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
* | | | WGZ is just a ZIP, so accept that too.Warwick Allison2010-01-051-1/+2
* | | | Basic WGT/WGZ support.Warwick Allison2010-01-053-6/+109
|/ / /
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-12-1815-1635/+0
|\ \ \
| * | | Remove creatorplugin (it's moved to the creator repository)Bea Lam2009-12-1715-1635/+0
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-1712-164/+219
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-173-4/+47
| |\ \ | | |/ | |/|
| | * doc: Final fix. Example image links now display the image.Martin Smith2009-12-153-1/+47
| | * doc: Fixed erroneous qdoc error message.Martin Smith2009-12-141-4/+1
| * | fix build with namespaced qtOswald Buddenhagen2009-12-161-0/+2
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-154-4/+13
| |\ \
| | * | Fix precision loss warning (qreal vs. float on Windows)Alessandro Portale2009-12-151-1/+1
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-12-141-0/+2
| | |\ \
| | | * | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| | | |/
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-141-2/+9
| | |\ \ | | | |/ | | |/|
| | | * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-091-2/+9
| * | | Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| * | | Designer: Handle "visible"-properties of item view headers correctly.Friedemann Kleint2009-12-102-105/+88
| * | | Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| * | | Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
* | | | Make QListModelInterface API more sensible for our use case.Martin Jones2009-12-162-0/+15
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-101-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-044-3/+10
| | |\ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-0316-46/+90
| | |\ \ \
| | * | | | Make lrelease link again with the win32-icc and win32-g++ mkspecsJan-Arve Sæther2009-12-031-1/+1
* | | | | | Compile when in a module.Warwick Allison2009-12-082-3/+3
* | | | | | Add info about qmldebugger and its creator plugin, with screenshot.Bea Lam2009-12-082-6/+12
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-5/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-073-5/+4
| |\ \ \ \ \
| | * | | | | make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-042-0/+4
| | * | | | | remove dead fileOswald Buddenhagen2009-12-041-5/+0
* | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-12-0726-59/+343
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Martin Jones2009-12-0720-42/+191
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-0720-42/+191
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of oslo-staging-1/4.6...Simon Hausmann2009-12-0510-26/+168
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-047-11/+11
| | | | |\ \ \ \ \
| | | | * | | | | | doc: Example page now lists images used by the exampleMartin Smith2009-12-0410-26/+168
| | | * | | | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-2/+2
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | / / | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-031-2/+2
| | | | |\ \ \ \ \
| | | | | * | | | | Fixed "illegal empty declaration" warning from \tools\xmlpatternsJanne Anttila2009-12-021-2/+2
| | | | | | |_|/ / | | | | | |/| | |