summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
* Doc AugmentationAlan Alpert2010-03-262-1/+16
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-26334-14194/+14777
|\
| * Use QThread IdlePriority rather than linux platform code.Martin Jones2010-03-261-14/+1
| * Test and fix order of transform application.Warwick Allison2010-03-266-41/+36
| * Test transforms.Warwick Allison2010-03-261-0/+21
| * 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-266-63/+38
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2619-26/+108
| |\
| | * Do not call parent implementation if we accept the keyPressEvent in GridView ...Yann Bodson2010-03-262-6/+6
| | * Update test.Michael Brasser2010-03-261-3/+1
| | * Add autotest for QTBUG-9367.Michael Brasser2010-03-263-0/+23
| | * Remove Q prefix from the validators.Michael Brasser2010-03-265-16/+16
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-267-0/+61
| | |\
| | | * Add declarative subdir to examples.proJoona Petrell2010-03-261-0/+1
| | | * Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-266-0/+60
| | * | Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| | |/
| * | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2620-86/+696
| |/
| * 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-26296-14116/+13860
| | |\
| | * | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| * | | Document Particles module import.Martin Jones2010-03-262-1/+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-255-27/+52
| |\ \
| | * | Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-252-2/+47
| | * | 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-25284-13970/+13782
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-25284-13972/+13784
| | |\ \
| | | * | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | | * | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | | * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | | * | 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-25226-3447/+2531
| | | |\ \
| | | | * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | | | |\ \ | | | |_|/ / | | |/| | |
| | | * | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | | |/ /
| | | * | Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | | * | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | | * | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2520-24/+67
| | | * | 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-24146-1017/+4133
| | | |\ \
| | | | * | Update changelogThiago Macieira2010-03-241-0/+10