summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-271-2/+4
|\
| * Update 4.8.0 changelogGabriel de Dietrich2011-09-161-0/+1
| * Changelog: update changes-4.8.0 for RichardRichard Moe Gustavsen2011-09-151-2/+3
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-0112-18/+25
|\ \ | |/
| * Add briefs for the new 4.8 examples.Casper van Donderen2011-09-016-6/+6
| * Add briefs to the new 4.8 demos.Casper van Donderen2011-09-016-12/+19
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-01357-1365/+2437
|\ \ | |/
| * Add a brief to all demos and examples for manifestCasper van Donderen2011-09-01292-380/+549
| * Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3165-985/+1888
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-3149-859/+1685
| | |\
| | | * don't crash when destroying the shortcutsKonstantin Ritt2011-08-301-1/+2
| | | * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-29101-969/+1255
| | | |\
| | | * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-26105-351/+887
| | | |\ \
| | | * | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-224-3/+7
| | | * | | fix warningKonstantin Ritt2011-08-221-1/+1
| | | * | | remove unused functionsOswald Buddenhagen2011-08-222-51/+0
| | | * | | Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-198-4/+149
| | | * | | Fix a typo in qt-conf docs.Casper van Donderen2011-08-191-1/+1
| | | * | | Revert "Fix build with the Clang compiler"Tor Arne Vestbø2011-08-181-3/+3
| | | * | | Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
| | | * | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-1814-21/+21
| | | * | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-1863-3025/+17812
| | | |\ \ \
| | | * | | | Fix build with the Clang compilerTor Arne Vestbø2011-08-161-3/+3
| | | * | | | Change spacing of title in offline style.Casper van Donderen2011-08-161-3/+9
| | | * | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-153-2/+28
| | | * | | | examples: fix compilation with namespaced Qt.hjk2011-08-158-6/+12
| | | * | | | Russian translation updateSergey Belyashov2011-08-124-288/+687
| | | * | | | Update Japanese translations for Qt 4.8.Takumi ASAKI2011-08-124-468/+640
| | | * | | | directfb: Include directfbgl.h directlyHolger Hans Peter Freyther2011-08-121-1/+1
| | | * | | | tests: fix QNetworkProxyFactory testCorentin Chary2011-08-121-1/+1
| | | * | | | don't detach until the list is going to be modifiedRitt Konstantin2011-08-121-1/+0
| | | * | | | optimize QList::removeAll()Ritt Konstantin2011-08-124-11/+275
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-3011-100/+132
| | |\ \ \ \ \
| | | * | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-08-301-11/+12
| | | * | | | | QSslCertificate: regenerate blacklisted certificates, they were expiredPeter Hartmann2011-08-309-90/+90
| | | * | | | | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-302-0/+31
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-08-301-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Doc: added since tag to QDateTime::msecsToJoerg Bornemann2011-08-301-0/+2
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-304-18/+65
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-302-2/+15
| | | * | | | | | FocusScope's focusItem must always be a descendentAlan Alpert2011-08-302-16/+50
* | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-30757-9626/+31639
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '4.8'Casper van Donderen2011-08-3019-68/+380
| |\ \ \ \ \ \ \ \
| | * | | | | | | | qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | * | | | | | | | Doc: Added a note to Code Editor example docsGeir Vattekar2011-08-251-0/+26
| | * | | | | | | | Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docsGeir Vattekar2011-08-251-12/+12
| | * | | | | | | | Doc: Added a link in Symbian Intro to Required CapabilitiesGeir Vattekar2011-08-241-0/+2
| | * | | | | | | | Doc: Added info on ordered targets for VS to qmake manualGeir Vattekar2011-08-241-0/+23
| | * | | | | | | | Doc: Small addition to the QML anchor layout docsGeir Vattekar2011-08-241-1/+6
| | * | | | | | | | Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5