summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Don't compile qtconfig on symbianOlivier Goffart2011-02-281-1/+1
* qtconfig: don't connect to qt3support signalsOlivier Goffart2011-02-282-7/+8
* Fix errors and warnings in qtconfig.Olivier Goffart2011-02-282-2/+2
* Remove qt3support dependency of qtconfigOlivier Goffart2011-02-2823-2798/+1496
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-251-0/+5
|\
| * 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 remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-6/+4
|\ \ \ | |/ /
| * | 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
| | |\ \ \
| * | | | | Another stab at fixing compilation on old Symbian platformsJoona Petrell2011-02-222-5/+3
| | |/ / / | |/| | |
| * | | | Fix compilation on old Symbian platformsJoona Petrell2011-02-181-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-02-221-6/+14
|\ \ \ \ \
| * | | | | Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2011-02-211-6/+14
* | | | | | Fix compilation: Q_UNUSED takes exactly one variable that is unusedThiago Macieira2011-02-211-1/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-173-5/+14
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-141-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-111-2/+2
| * | | | Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
* | | | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-6/+27
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-311233-1287/+1297
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Help message clarificationThiago Marcos P. Santos2011-01-141-1/+1
| * | | | | No longer copy the executable file to phone by defaultThiago Marcos P. Santos2011-01-141-5/+26
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-10122-14413/+7753
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
| * | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-241-1/+4
| |\ \ \ \ \ \
| | * | | | | | Ensured that an uninitialized output codec is never used.David Boddie2011-01-241-1/+4