summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-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
| |\ \ \ | | |/ /
| | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1428-85/+286
| | |\ \
| * | \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-141-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64fJan-Arve Sæther2010-12-141-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-12-141-2/+2
| | |\ \ \
| | * | | | Make sure that d->init() is called from both ctors.Jan-Arve Sæther2010-12-141-1/+2
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1444-158/+842
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix failing tst_QGraphicsView::QTBUG_16063_microFocusRect auto-testGabriel de Dietrich2010-12-141-2/+2
| | |/ / /
| | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1342-157/+802
| | |\ \ \
| | * | | | Fixes text jitter in QtQuick components when using the virtual keyboardGabriel de Dietrich2010-12-132-1/+40
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-131-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Symbian specific input methods should use 'Text' mode as default caseSami Merila2010-12-131-1/+1
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1318-196/+299
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-111-0/+7
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1016-174/+276
| | |\ \ \ \ \
| | * | | | | | Fix whitespace in qs60style.cppSami Merila2010-12-101-1/+1
| | * | | | | | QDateTimeEdit is not showing correctly when resizes in symbianSami Merila2010-12-101-22/+16
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-102-3/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-092-3/+2
| | |\ \ \ \ \ \