summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-0924-83/+322
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0822-76/+314
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-162-10/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve performance of clipping to a scaled QRectFLars Knoll2010-12-152-10/+25
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-156-18/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
| * | | | | | | | | | ICC: Don't print warning 1259 since it's too annoying.Thiago Macieira2010-12-151-1/+1
| * | | | | | | | | | Autotest: Add some comments about this obscure test.Thiago Macieira2010-12-151-2/+6
| * | | | | | | | | | Add a warning about trying to release a timer ID that isn't activeThiago Macieira2010-12-151-0/+1
| * | | | | | | | | | Don't need to set FD_CLOEXEC since qt_safe_* will have done that.Thiago Macieira2010-12-151-13/+0
| * | | | | | | | | | Check for null-pointer to avoid a crash in textedit demo.Denis Dzyubenko2010-12-151-2/+4
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Resize event for QDesktopWidget was sent too earlyMiikka Heikkinen2010-12-151-3/+3
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-151-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-152-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| * | | | | | | | | Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-153-12/+89
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge commit 'c9faf2defa9fa3209e44e8a5c1ae2da8e630d379' into maemo/199755Aaron McCarthy2010-12-153-12/+89
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88