summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Document - and use - the qmlRegisterXXX template functionsmae2010-03-103-6/+6
* Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-1012-119/+125
|\
| * Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17
| * qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-083-0/+11
| * qdoc: Added some debug output to track down a crashMartin Smith2010-03-081-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-074-88/+95
| |\
| | * Partial overloading support for qdbus cli tool.Kimmo Kotajärvi2010-03-051-84/+91
| | * Assistant: Fix warnings about unused variables.ck2010-03-053-4/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-101-5/+5
|\ \ \
| * | | update Browser.qml to run againAlan Alpert2010-03-091-5/+5
| |/ /
* | | Link with the correct library for TCommDbConnPrefMartin Jones2010-03-101-1/+1
|/ /
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-063-9/+66
|\ \ | |/ |/|
| * fix "using namespace" recursion crashOswald Buddenhagen2010-03-051-8/+20
| * update russian translations and phrasebookRitt Konstantin2010-03-021-0/+40
| * Help system: Build search index with low priority.ck2010-03-012-2/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-011-1/+6
| |\
| | * Test modifications for the Windows Mobile platform.ninerider2010-02-271-1/+6
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-261-1/+1
| |\ \ | | |/ | |/|
| | * fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0530-38/+322
|\ \ \
| * | | Updated URLs.Robert Loehning2010-03-041-1/+1
| * | | Set database write behavior to synchronous=OFF and increase page cache.kh12010-03-042-0/+11
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-044-4/+16
| |\ \ \
| | * | | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-2/+0
| | * | | Fix compileJarek Kobus2010-03-041-0/+1
| | * | | Make QLabel::text a reloadable propertyJarek Kobus2010-03-043-2/+15
| * | | | doc: Fixed some qdoc errors.Martin Smith2010-03-041-1/+3
| |/ / /
| * | | qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-032-8/+7
| * | | Assistant: Don't warn for non-existing English to English translations.ck2010-03-021-1/+1
| * | | Assistant: Un-watch files at shutdown.ck2010-03-021-0/+7
| * | | Help system: Build search index with low priority.ck2010-03-022-2/+2
| * | | Compile.Morten Johan Sørvig2010-03-021-0/+1
| * | | Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0215-21/+53
| |\ \ \
| | * | | Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-0115-21/+53
| * | | | QDeclarativeView: Add a Designer plugin.Friedemann Kleint2010-03-024-0/+220
* | | | | Let the 'qml' runtime use its applicationDirPath as importsPathmae2010-03-021-0/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-021-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into 4.7Aaron Kennedy2010-03-021-2/+2
| |\ \ \ \
| | * | | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-021-2/+2
* | | | | | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
|/ / / / /
* | | | | Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
* | | | | build fix for WinCEMaurice Kalinowski2010-03-011-1/+3
* | | | | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
|/ / / /
* | | | Fix compile warningAaron Kennedy2010-03-011-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-271-1/+10
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-271-1/+10
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-261-1/+10
| | |\ \ \
| | | * \ \ Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-261-1/+10
| | | |\ \ \
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-261-1/+10
| | | | |\ \ \
| | | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-251-1/+10
| | | | | |\ \ \