summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
* Doc AugmentationAlan Alpert2010-03-261-1/+3
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-26204-3495/+8821
|\
| * Use QThread IdlePriority rather than linux platform code.Martin Jones2010-03-261-14/+1
| * Test and fix order of transform application.Warwick Allison2010-03-265-37/+26
| * Fix namespace.Warwick Allison2010-03-261-1/+3
| * Simple case, no size returned.Warwick Allison2010-03-261-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-4/+0
| |\
| | * QDeclarativeItem don't need to emit childrenChanged anymore.Alexis Menard2010-03-261-4/+0
| * | sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-264-47/+24
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2610-18/+64
| |\
| | * Do not call parent implementation if we accept the keyPressEvent in GridView ...Yann Bodson2010-03-262-6/+6
| | * Remove Q prefix from the validators.Michael Brasser2010-03-263-11/+13
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-264-0/+44
| | |\
| | | * Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-264-0/+44
| | * | Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| | |/
| * | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2612-78/+514
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-262-0/+167
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-26183-3430/+8151
| | |\
| | * | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| * | | Document Particles module import.Martin Jones2010-03-261-0/+5
| | |/ | |/|
| * | Remove some Script {} docsMartin Jones2010-03-254-105/+12
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-254-27/+9
| |\ \
| | * | Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-251-2/+4
| | * | Clean upBea Lam2010-03-251-20/+0
| | * | Remove int parameter from ListModel countChanged() to be consistentBea Lam2010-03-253-5/+5
| * | | Ensure both qMin() parameters are the same type.Martin Jones2010-03-251-1/+1
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-25173-3288/+8120
| |\ \
| | * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
| | * | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | * | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-2579-1242/+1127
| | |\ \
| | | * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
| | | |\ \
| | * | | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/ / /
| | * | | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | * | | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2515-18/+40
| | * | | Don't emit signals in constructor.Aaron McCarthy2010-03-252-4/+11
| | * | | Remove unused code.Aaron McCarthy2010-03-252-212/+113
| | * | | fix multiple promps for keychain access when connecting to wifi networkLorn Potter2010-03-252-39/+111
| | * | | not all interfaces should be activeLorn Potter2010-03-251-2/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-2483-712/+852
| | |\ \ \
| | | * \ \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2410-24/+24
| | | |\ \ \
| | | * | | | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | * | | | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2412-200/+287
| | | |\ \ \ \
| | | | * | | | Do not move keyboard focus to invisible windows on X11.Denis Dzyubenko2010-03-242-6/+2
| | | | * | | | Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.Denis Dzyubenko2010-03-241-1/+2
| | | | * | | | Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""Denis Dzyubenko2010-03-243-1/+25
| | | | * | | | Give 1-pixel splitters a larger grab areaJens Bache-Wiig2010-03-242-1/+32
| | | | * | | | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215