summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1939-2702/+2754
|\
| * Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1933-2658/+2697
| * Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-191-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-195-43/+56
| |\
| | * Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | * ListView.visibleArea.heightRatio should not emit a signal when it does not ch...Yann Bodson2010-10-183-13/+26
| | * Properties should have precedence over methods.Michael Brasser2010-10-181-29/+29
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-192-3/+8
|\ \ \
| * | | Fix partial upgrade package UID for libinfixed QtMiikka Heikkinen2010-10-191-1/+4
| * | | Fixed recursive sis file generation.axis2010-10-191-2/+2
| * | | Readded DESTDIR that was removed by mistake in a3c755e358596.axis2010-10-191-0/+2
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-191-8/+30
|\ \ \ | |/ / |/| |
| * | Fix crash on exit.Aaron McCarthy2010-10-191-8/+30
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-181-0/+2
|\ \ \
| * | | QS60Style: ComboBox disappears after orientation switchSami Merila2010-10-181-0/+2
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-186-14/+130
|\ \ \ | |_|/ |/| |
| * | In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| * | Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0
| * | ::copy on the QMeeGoPixmapData creates a raster-backed pixmap.Michael Dominic K2010-10-185-2/+124
| * | Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-181-1/+5
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1842-1309/+1277
|\ \
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1613-62/+383
| |\ \ | | |/
| | * Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-161-9/+6
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1520-85/+434
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1520-85/+434
| | | |\
| | | | * Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37
| | | | * QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1466-335/+659
| | | | |\
| | | | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1457-275/+313
| | | | | |\
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1410-60/+346
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1310-60/+346
| | | | | | |\ \
| | | | | | | * | QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-132-10/+11
| | | | | | | * | QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-132-191/+122
| | | | | | | * | Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-134-13/+318
| | | | | | | * | Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-131-4/+4
| | | | | | | * | Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-132-5/+13
| | | | | | | * | Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | | | | | * | Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| | | | | | | * | In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| | | | | | | * | QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-132-6/+13
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1529-1247/+894
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-152-16/+48
| | |\ \ \ \ \ \ \
| | | * | | | | | | QNAM HTTP: Fix error signal emission for unreachable IPsMarkus Goetz2010-10-151-2/+12
| | | * | | | | | | Cocoa: small update to 534ba3c7314820604ba5aeeffa6051c91e7c1d09Richard Moe Gustavsen2010-10-151-5/+8
| | | * | | | | | | Cocoa: fix child window issues (QTBUG 13867, 14420, 13126)Richard Moe Gustavsen2010-10-151-14/+33
| | | |/ / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-158-1039/+356
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Implemented Qt::WA_ShowWithoutActivating for Symbian.Janne Anttila2010-10-151-1/+1
| | | * | | | | | Clean up ARM SIMD drawhelper code and make sure it works.Jani Hautakangas2010-10-157-1038/+355
| | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1555-269/+291
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1455-269/+291
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |