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 System2011-01-0622-69/+6931
|\
| * fix build with namespaces in new cookie jar tablePeter Hartmann2011-01-061-0/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0622-69/+6929
| |\
| | * cookie jar code: enhance security by keeping track of effective TLDsPeter Hartmann2011-01-058-12/+6825
| | * Add support for QMetaType::QVariant in ActiveQtPrasanth Ullattil2011-01-051-2/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0513-55/+103
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0413-55/+103
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-0413-55/+103
| | | | |\
| | | | | * Fix QNetworkReply autotest cases for QT-3494Ville Pernu2010-12-311-9/+13
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-3112-46/+90
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-3012-46/+90
| | | | | | |\
| | | | | | | * Add compiler optimization for QtScript/JSC on SymbianKent Hansen2010-12-281-0/+10
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-2311-46/+80
| | | | | | | |\
| | | | | | | | * improve performance of QTextEngine, esp. setBoundary by using non-detaching o...Milian Wolff2010-12-231-7/+7
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-2310-39/+73
| | | | | | | | |\
| | | | | | | | | * Improve docs for QTEST_MAIN macro.Jason McDonald2010-12-231-1/+5
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-229-38/+68
| | | | | | | | | |\
| | | | | | | | | | * Work around an apparent GCC optimiser bug accessing arrays beyond endThiago Macieira2010-12-221-28/+40
| | | | | | | | | | * Do not crash in case a future version of libdbus has a new kind of message.Thiago Macieira2010-12-221-3/+1
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-227-7/+27
| | | | | | | | | | |\
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-12-22144-3733/+2965
| | | | | | | | | | | |\
| | | | | | | | | | | | * tst_headers: make failure more detailed when failing to open a fileRohan McGovern2010-12-211-3/+3
| | | | | | | | | | | | * 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
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * 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
| | | | | | | | | | | * | | | | | | Docs: QTBUG-9150 Incorrect snippet in class doc.Peter Yard2010-12-221-1/+1
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-065-2/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-063-1/+38
| * | | | | | | | | | | | | | | | | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-063-1/+45
* | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| * | | | | | | | | | | | | | | | Doc fixes for introduction page and Item docsBea Lam2011-01-062-111/+130
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0510-130/+1779
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix outdated testsAlan Alpert2011-01-0510-130/+1779
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-043-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| * | | | | | | | | | | | | | | Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-049-11/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| * | | | | | | | | | | | | | | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| * | | | | | | | | | | | | | | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| * | | | | | | | | | | | | | | QMeeGoSwitchEvent exported and static.Michael Dominic K2011-01-041-2/+2
| * | | | | | | | | | | | | | | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-042-1/+28
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0420-923/+923
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \