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-08-111-1/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Henrik Hartz2010-08-11144-4961/+10687
| |\
| * | Remember to reset clipping when overriding paint in QDeclarativeItemHenrik Hartz2010-08-111-1/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-104-3/+16
| | |\ \ \
| | | * | | Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-104-3/+16
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-116-10/+8
|\ \ \ \ \ \
| * | | | | | fix loading of module configsOswald Buddenhagen2010-08-114-5/+1
| * | | | | | don't load modules from qt.prfOswald Buddenhagen2010-08-111-3/+0
| * | | | | | add comment explaining why this file does magic instead of just voodooOswald Buddenhagen2010-08-111-0/+3
| * | | | | | configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| * | | | | | Don't build bearercloud example if Qt was build w/o SVG supportAlex2010-08-111-1/+4
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-1113-37/+51
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Fix cppextension examples.Martin Jones2010-08-1110-20/+20
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-11108-4862/+10509
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-113-14/+32
| | |\ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-10108-4862/+10509
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-10108-4862/+10509
| |\ \ \ \ \ |/ / / / / /
| * | | | | Fix memory leak in QtScript variable objectKent Hansen2010-08-102-2/+2
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+7
| |\ \ \ \ \
| | * | | | | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-102-0/+7
| * | | | | | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-1014-23/+24
| |/ / / / /
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+19
| |\ \ \ \ \
| | * | | | | Mac: Fix crash when using style to draw on other things than widgetsRichard Moe Gustavsen2010-08-101-0/+3
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-1025-61/+127
| | |\ \ \ \ \
| | * | | | | | Doc: Adding radius support for CSS3 and webkitMorten Engvoldsen2010-08-101-0/+16
| * | | | | | | doc: Some reorganization of top page topic hierarchy.Martin Smith2010-08-107-18/+17
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-1083-4819/+10440
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regressionBradley T. Hughes2010-08-101-1/+1
| | * | | | | add performance comparisons to qregexp benchmarkArvid Ephraim Picciani2010-08-103-1/+320
| | * | | | | configure: fix error message when calling config.statusJoerg Bornemann2010-08-091-1/+1
| | * | | | | Fix invalid memory write during recursive timer activationBradley T. Hughes2010-08-093-20/+59
| | * | | | | Added comment about calendarPopup in setCalendarWidget function documentation.Jerome Pasion2010-08-091-0/+1
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0945-87/+134
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0932-87/+9801
| | | |\ \ \ \ \
| | | | * | | | | CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.Carlos Manuel Duclos Vergara2010-08-091-0/+4
| | | | * | | | | XmlListModel doc fixesBea Lam2010-08-091-1/+7
| | | | * | | | | Mention QML_IMPORT_TRACE in Modules docsBea Lam2010-08-091-0/+8
| | | | * | | | | Merge sections about when property and default stateBea Lam2010-08-091-36/+59
| | | | * | | | | Explain Flipable example furtherBea Lam2010-08-091-4/+10
| | | | * | | | | PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
| | | * | | | | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-0939-45/+45
| | * | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-9/+8
| | * | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-08-091-1/+1
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.Christian Kamm2010-08-091-2/+2
| | * | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-08-092-7/+1
| | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-096-0/+9667
| | |\ \ \ \ \ \
| | | * | | | | | Add Ukrainian translation.Victor Ostashevsky2010-08-096-0/+9667