summaryrefslogtreecommitdiffstats
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-12-215-3/+23
|\
| * Fix number of chapters in qtestlib tutorial.Jason McDonald2010-12-211-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-204-2/+22
| |\
| | * Fixed QStatusBar not to repaint itself too earlyDenis Dzyubenko2010-12-201-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-203-1/+21
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-2013-18/+33
| | | |\
| | | | * Make it clear which security updates are needed for Visual Studio 2005.Jason McDonald2010-12-201-0/+1
| | | * | QNAM HTTP: Fix missing error() signalVille Pernu2010-12-202-1/+20
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-212-0/+70
|\ \ \ \ \
| * | | | | Add tests for ListView.indexAt() and GridView.IndexAt()Martin Jones2010-12-212-0/+70
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-202-35/+67
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | runonphone: Only print the modprobe instructions on linuxMartin Storsjo2010-12-201-0/+4
| * | | | | reword: Make the USB serial device enumeration work on OS X, tooMartin Storsjo2010-12-201-4/+19
| * | | | | runonphone: Check that the device->config is valid before dereferencing itMartin Storsjo2010-12-201-1/+1
| * | | | | Remove few compile warningsMiikka Heikkinen2010-12-201-2/+2
| * | | | | Fix using QFileDialog statics in Symbian.Miikka Heikkinen2010-12-201-28/+41
| | |/ / / | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2011-13/+97
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-204-0/+30
| * | | Update test bitmaps for QDeclarativeImage::svg() autotest on WindowsJoona Petrell2010-12-202-0/+0
| * | | Don't truncate image:// url strings prematurelyBea Lam2010-12-203-12/+62
| * | | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-201-1/+1
|\ \ \
| * | | Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-201-0/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-181-1/+7
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-181-1/+7
| |\ \ |/ / /
| * | Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+2
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-1712-36/+120
| |\ \
| * | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-175-12/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix QDeclarativeState::reset() autotestJoona Petrell2010-12-173-12/+10
| * | | Update test bitmaps for QDeclarativeImage::svg() autotest on LinuxJoona Petrell2010-12-172-0/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-171-4/+4
|\ \ \ \
| * | | | Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-174-1/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-164-1/+8
| |\ \ \ \
| | * | | | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| | | |_|/ | | |/| |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-163-2/+48
|\ \ \ | |_|/ |/| |
| * | Improved orientation change autotestMiikka Heikkinen2010-12-162-0/+44
| * | Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-167-32/+67
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-159-34/+118
| |\
| | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-159-34/+118
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-1428-85/+286
| |\ \ \ | | |/ /