summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-117-19/+682
|\
| * Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-105-17/+678
| * Fixed a bug in implementation of sizeHint() when there was a constraintJan-Arve Sæther2010-08-102-2/+4
* | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-112-19/+20
* | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
* | Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-11107-4850/+10499
|\ \
| * \ 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
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-4/+4
| | | |/ / /
| | | * | | doc: Fixed some qdoc errors.Martin Smith2010-08-098-17/+22
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-4/+4
| | | |\ \ \
| | | | * | | Doc: removing reduntant text from the index pageMorten Engvoldsen2010-08-091-4/+4
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-094-5/+5
| | | |/ / /
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750Jerome Pasion2010-08-091-1/+1
| | | * | | doc: Fixed some qdoc errors.Martin Smith2010-08-095-6/+7
| | | |/ /
| | | * | doc: Fixed some qdoc errors.Martin Smith2010-08-091-63/+1
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-095-4629/+278
| | | |\ \
| | | | * | I18N: Update German translations for 4.7.0.Friedemann Kleint2010-08-095-4629/+278