summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* minor clean-ups and styling fixesRitt Konstantin2010-03-021-16/+12
* don't even try to rehighlight invalid or alien blockRitt Konstantin2010-03-021-1/+1
* don't cancel the scheduled complete rehighlight from rehighlightBlock()Ritt Konstantin2010-03-021-0/+5
* replace temporary disconnection with a very simple statemachineRitt Konstantin2010-03-021-6/+14
* Merge branch 'master-staging1' into 4.7-staging1Denis Dzyubenko2010-03-022-8/+105
|\
| * Extended gesture autotest.Denis Dzyubenko2010-03-012-1/+59
| * Fixed coordinate system conversion for gestures.Denis Dzyubenko2010-03-012-7/+46
* | doc: Fixed some qdoc errors.Martin Smith2010-03-022-2/+2
* | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0222-302/+730
|\ \
| * \ Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-022627-143654/+170820
| |\ \
| * | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-0223-369/+794
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-015-32/+60
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-015-32/+60
| |\ \ \
| | * | | removed dead codeThierry Bastian2010-03-011-21/+12
| | * | | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-013-8/+38
| | * | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0121-61/+152
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-012-1/+2
| |\ \ \ \
| | * | | | Updated .gitignore with the new name of the qmlviewerThorbjørn Lindeijer2010-03-011-1/+1
| | * | | | Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
| * | | | | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| |/ / / /
| * | | | Doc: brief Qt Quick introduction on "What's New" page.Volker Hilsheimer2010-03-011-1/+24
| * | | | Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
| * | | | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
| * | | | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
| * | | | Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.Volker Hilsheimer2010-03-011-3/+5
| * | | | Use QList::reserve() in QDataStream>>QListAndreas Kling2010-03-011-0/+1
| * | | | Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
| * | | | compile fix with namespaceshjk2010-03-011-1/+2
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-011-2/+1
| |\ \ \ \
| | * | | | qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
| * | | | | build fix for WinCEMaurice Kalinowski2010-03-011-1/+3
| |/ / / /
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-013-4/+19
| |\ \ \ \
| | * | | | Mac: using Qt to write plugins disables quit for 3rd party applicationRichard Moe Gustavsen2010-03-011-3/+17
| | * | | | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | * | | | Updated syncqt to use relative include paths on cygwin as well.Zeno Albisser2010-03-011-1/+2
| * | | | | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0129-35/+48
|\ \ \ \ \
| * | | | | Make SameGame tutorials share imagesAlan Alpert2010-03-0127-15/+20
| * | | | | Fix minehunt demoAlan Alpert2010-03-012-7/+11
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-03-01553-5841/+29579
| |\ \ \ \ \
| * | | | | | Make Minehunt demo compile.Alan Alpert2010-03-011-13/+17
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-012-3/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-012-3/+4
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Fix building with Sun CC 5.10: missing :: for the QWeakPointer declarationThiago Macieira2010-03-011-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | compile fix for WinCEMaurice Kalinowski2010-03-011-1/+2
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-03-015-51/+119
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-014-46/+110
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-012-5/+2
| | |\ \ \ \ \