summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
| * Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-071-1/+0
* | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0722-125/+204
|\ \ | |/
| * explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-071-2/+2
| * Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ...Morten Engvoldsen2010-09-071-1/+1
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-076-19/+74
| |\
| | * Pause orientation sensors in Qml Viewer when the application window is not ac...Joona Petrell2010-09-075-17/+73
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-064-4/+21
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-061-2/+1
| | |\ \
| | | * | Fix recording of QML visual tests when using a QGLWidget viewport.Michael Brasser2010-09-061-2/+1
| * | | | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0712-99/+116
| | |_|/ | |/| |
| * | | search translator commentsOswald Buddenhagen2010-09-061-0/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-063-4/+19
| |\ \ \ | | |/ / | |/| |
| | * | Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | * | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-031-0/+4
| | * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-031-1/+1
| * | | Designer: Fix action editor scrolling.Friedemann Kleint2010-09-061-2/+4
| | |/ | |/|
* | | Doc: Added dual documentation license information to the HTML templates.David Boddie2010-09-063-0/+27
* | | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0337-458/+590
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-021-1/+13
| |\ \ | | |/ | |/|
| | * Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-021-1/+13
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-011-1/+158
| |\ \ | | |/ | |/|
| | * The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-3/+1
| | * Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+160
| * | QString usage cleanupsOswald Buddenhagen2010-09-013-17/+17
| * | Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-0128-219/+269
| * | Enable loading/generating translations by assistant and linguist toolsVictor Ostashevsky2010-09-016-6/+80
| |/
| * Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| * fix windows build with -prefixOswald Buddenhagen2010-08-311-3/+5
| * Center and clip QML startup animation so it looks correct in fullscreenAaron Kennedy2010-08-311-41/+47
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-024-9/+9
|\ \ | |/ |/|
| * Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-304-9/+9
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-311-1/+1
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-301-1/+1
| |\ \
| | * | QML Viewer should be put under QtDemos instead of QtExamples folder in Symbia...Joona Petrell2010-08-301-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-305-40/+74
|\ \ \ \ | |/ / / |/| | |
| * | | preserve non-standard source referencesOswald Buddenhagen2010-08-301-4/+20
| * | | properly parse ts contexts in obsolete messagesOswald Buddenhagen2010-08-301-0/+2
| * | | move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handlerOswald Buddenhagen2010-08-302-8/+15
| * | | make qdoc3 boot-strappable againHarald Fernengel2010-08-301-0/+1
| | |/ | |/|
| * | Designer: Fix crash on unsupported Language/Country combination.Friedemann Kleint2010-08-301-6/+14
| * | Doc: Whitespace fixes.David Boddie2010-08-271-23/+23
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-272-6/+6
|\ \ | |/ |/|
| * Do not use global static const references to objectsOlivier Goffart2010-08-262-6/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-265-68/+446
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-255-68/+446
| |\ \ | | |/ | |/|
| | * qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-244-66/+437
| | |\
| | | * fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-1/+7
| | | * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-2/+1
| | | * Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()Kent Hansen2010-08-232-0/+40