summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-197-113/+125
|\
| * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-192-5/+3
| |\
| * | Dont force height for filter widgetJens Bache-Wiig2010-03-181-7/+0
| * | Redesigned filter widgetsJens Bache-Wiig2010-03-184-100/+116
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-171-1/+4
| |\ \
| | * | Use a toolbar for the designer property editorJens Bache-Wiig2010-03-171-1/+4
| * | | qdoc3: Fixed some ifdef typos and removed some whitespace.Martin Smith2010-03-172-10/+10
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-192-5/+3
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-172-5/+3
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-162-1/+2
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1155-211/+624
| | |\ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0145-319/+478
| | |\ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2386-3322/+1719
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1986-167/+9926
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1826-950/+1528
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16214-11500/+14692
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1633-238/+875
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-12145-5707/+1398
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Fix linking for armlinkThomas Zander2010-02-042-5/+3
* | | | | | | | | | | Don't destroy cookie jar until while someone may be using it.Martin Jones2010-03-181-24/+34
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-1718-76/+179
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-1519-81/+184
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Apply the stdset attribute for resource propertiesJarek Kobus2010-03-151-3/+8
| | * | | | | | | | | Fix broken setCollectionFile (creating multiple models instead reusing)kh12010-03-153-10/+13
| | * | | | | | | | | qdoc: ifdefed out all the debug code.Martin Smith2010-03-159-9/+17
| | * | | | | | | | | Fix SetDialogPreference build error on Symbian.Morten Johan Sørvig2010-03-121-1/+1
| | * | | | | | | | | CompileKent Hansen2010-03-111-1/+1
| | * | | | | | | | | Add a placeholder text into the new search lineeditHarald Fernengel2010-03-111-0/+1
| | * | | | | | | | | Ui improvements to QDBusViewer.Stephen Kelly2010-03-112-32/+54
| | * | | | | | | | | Make double-clicking a d-bus method work againHarald Fernengel2010-03-111-0/+1
| | * | | | | | | | | Changed Qdbusviewer to match D-Bus type signature in addition to method name ...Kimmo Kotajärvi2010-03-114-1/+30
| | * | | | | | | | | qdoc: Added debug code.Martin Smith2010-03-116-0/+7
| | * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-114-29/+35
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | configure.exe: Fix inverted logicMarius Storm-Olsen2010-03-111-1/+1
| | | * | | | | | | | | Fixed the QML browser built into the QML viewerThorbjørn Lindeijer2010-03-101-5/+5
| | | * | | | | | | | | Make configure.exe fail for declarative if no script supportMarius Storm-Olsen2010-03-101-15/+27
| | | * | | | | | | | | Assistant: Fix full text indexing.ck2010-03-092-9/+3
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | qdoc: Fixed lookup of QML property nodes.Martin Smith2010-03-113-2/+23
| | |/ / / / / / / /
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-155-12/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Enable GL samplebuffers by default on Mac OS XAaron Kennedy2010-03-121-0/+5
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | 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.6Thiago Macieira2010-03-152-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | isalpha() is unspecified for values outside uchar and EOFOswald Buddenhagen2010-03-111-1/+1
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-101-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Implemented QLibraryInfo::TranslationsPath for Symbian.Janne Anttila2010-03-091-0/+1
* | | | | | | | | | | Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17