summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
* Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-214-43/+109
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-184-1/+39
| |\
| | * Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-184-1/+39
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-164-43/+71
| |\ \ | | |/
| | * Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-164-43/+71
* | | Bump Qt version to 4.7.4Timo Turunen2011-03-2110-29/+29
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-152-3/+5
|\ \ | |/
| * Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| * Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-1010-31/+31
|\ \
| * | Bump Qt version to 4.7.3Timo Turunen2011-03-0910-31/+31
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-03-081-1/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-081-1/+1
| |\ \ \
| | * | | Update copyright year to 2011.Jason McDonald2011-01-101182-1193/+1193
| | * | | embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-073-1/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-073-1/+14
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-281-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-251-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Always prepend drive letter to $$EPOCROOT in Windows Symbian buildsMiikka Heikkinen2011-02-241-0/+5
* | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-22123-14417/+7766
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-201-3/+7
| |\ \ \ \
| | * | | | Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-141-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-093-29/+66
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-093-29/+66
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-083-15/+22
| |\ \ \ \ \
| | * | | | | Fix the compilation error that the previous fix didn't fixThiago Macieira2011-02-081-1/+1
| | * | | | | Fix compilation error: symbol is namespaced.Thiago Macieira2011-02-081-0/+2
| | * | | | | Make qdbus show all types, even those that it doesn't know aboutThiago Macieira2011-02-061-2/+9
| | * | | | | Designer: Fix a crash in the Signal-Slot-Editor.Friedemann Kleint2011-02-042-13/+11
| | |/ / / /
| * | | | | Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-052-5/+17
| * | | | | Fixed build breakage.David Boddie2011-02-041-1/+1
| * | | | | Fixed C++ and plain markup found in \c commands.David Boddie2011-02-041-6/+25
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0410-58/+105
| |\ \ \ \ \
| * | | | | | Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-0310-175/+217
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-021-1/+1
| |\ \ \ \ \ \
| | * | | | | | Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| * | | | | | | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| * | | | | | | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| |/ / / / / /
| * | | | | | Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| * | | | | | Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| * | | | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-271-6/+4
| |\ \ \ \ \ \
| | * | | | | | Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-264-7/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0