summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix irix buildOswald Buddenhagen2010-05-203-0/+3
* clarify wording of warning messageOswald Buddenhagen2010-05-201-1/+1
* close scope while inside assignment only if the last char is a closing braceOswald Buddenhagen2010-05-201-1/+1
* deprecate undocumented -E optionOswald Buddenhagen2010-05-201-0/+1
* use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
* unify QMAKE_QMAKE path separator fixingOswald Buddenhagen2010-05-202-8/+6
* simplify arcane conditional, once againOswald Buddenhagen2010-05-201-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-20908-59997/+21750
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2080-223/+1441
| |\
| | * Removed a change from the 4.7.0 change log.Kim Motoyoshi Kalland2010-05-201-6/+0
| | * Improve look and feel of itemviews on macJens Bache-Wiig2010-05-201-6/+25
| | * doc: Fixed many broken links.Martin Smith2010-05-2016-64/+63
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-2017-22/+173
| | |\
| | | * update 4.7.0 changesKent Hansen2010-05-201-2/+0
| | | * QPushButton's click area exceeds the button area by far on Mac OS XCarlos Manuel Duclos Vergara2010-05-205-16/+68
| | | * QApplication::closeAllWindows() should ignore windows being closedBradley T. Hughes2010-05-202-3/+83
| | | * Examples: Fix compilation with namespace.ck2010-05-209-1/+22
| | * | doc: Fixed many broken links.Martin Smith2010-05-2030-66/+65
| | |/
| | * Use QApplication::arguments() to check for command line argsHarald Fernengel2010-05-205-26/+11
| | * Added support for .rc files on VS2010.Martin Petersson2010-05-201-2/+37
| | * Doc: Updating CSS and JSMorten Engvoldsen2010-05-203-8/+25
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-208-23/+1042
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-05-202-23/+73
| | | |\
| | | | * Fix crash on exit in native wifi plugin on Vista+ when run in debugger.Aaron McCarthy2010-05-202-23/+73
| | | * | Docs: added an intro for qml, Quick for Beginners.Peter Yard2010-05-206-0/+969
| | | |/
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2013-13/+64
| |\ \ \ | | |/ / | |/| |
| | * | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| | * | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-20210-3892/+4443
| | |\ \
| | | * | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | * | Remove warnings.Warwick Allison2010-05-202-3/+0
| | | * | Test e75088323ae15604139ddfd66b85cc3b8d43abebWarwick Allison2010-05-202-0/+6
| | | * | Add XmlListModel::errorString()Bea Lam2010-05-203-2/+37
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| | |\ \ \
| | * | | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19590-58544/+17061
| | |\ \ \ \
| | * | | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| | * | | | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| | * | | | Stop warnings.Warwick Allison2010-05-202-11/+11
| | * | | | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| | |\ \ \ \
| | | * | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | | * | | | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| | * | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
| | * | | | | Improve testcaseAaron Kennedy2010-05-202-1/+11
| | |/ / / /
| | * | | | Make test more stableAaron Kennedy2010-05-201-2/+3