summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Assistant: Fix warnings about unused variables.ck2010-03-053-4/+4
* 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
| | | | | |\
| | | | | | * Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-251-1/+10
* | | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2731-262/+302
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-265-12/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-2639-325/+421
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-244-11/+11
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| | | * | | | tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-262-2/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch '4.6'Miikka Heikkinen2010-02-262-2/+4
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Fix for cetest.David Laing2010-02-262-2/+4
| * | | | | | Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-2618-211/+262
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-2542-397/+435
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+13
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-1/+15
| | * | | | | Simplify QML element registration headersAaron Kennedy2010-02-242-0/+4
| | * | | | | Compile warning-- for qmlviewerLeonardo Sobral Cunha2010-02-241-1/+0
| | * | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-2442-396/+396