summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Test and fix order of transform application.Warwick Allison2010-03-266-41/+36
| | | | Remove Translate.z since Qt cannot sensibly support it yet.
* 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
| | | | Fixes Particles plugin.
* 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
| | | | | | | | | | | | It's done by QGraphicsItemPrivate::addChild and removeChild. Reviewed-by:akennedy
* | 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
| | | | | | | | and ListView delegates.
| * 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
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-266-0/+60
| | | | | | | | | | | | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
| * | Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| |/
* | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2620-86/+696
|/ | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984
* 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
| | | | | | | | | | | | with other classes with countChanged() signals.
* | | 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
|\ \ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-25284-13972/+13784
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (153 commits) Use QTRY_COMPARE after QTest::qWaitForWindowShown() Use the new memory cost reporting API in QtScript Custom Class example QtScript: Add API for reporting additional memory costs Add experimental support for StaticContents in Mac OS X. Fix misspelling in function name. don't just return the first key here. Fix CI sytem build breakage. Fix crash. Compile with QT_NO_NETWORKINTERFACE defined. Don't emit signals in constructor. Remove unused code. fix multiple promps for keychain access when connecting to wifi network not all interfaces should be active Update changelog Fix qcombobox:flaggedItems autotest failure. Wrong value for PM_ScrollBarExtent on Windows XP. doc: Fixed all the remaining qdoc errors. For now. Do not move keyboard focus to invisible windows on X11. Do not use _NET_ACTIVE_WINDOW for nonmanaged windows. Revert "Revert "Make QWidget::activateWindow() NET window manager aware."" ...
| | * | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Apparently it's possible that the window has been shown but haven't received a paint event yet.
| | * | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | | | | | | | | | | | | | | | Also describe its purpose in the example doc.
| | * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptEngine::reportAdditionalMemoryCost(int). This function provides the ability to give a hint to the engine that it should perhaps trigger garbage collection sooner rather than later. For example, if you've implemented a JS ByteArray class that wraps a QByteArray, and a user constructs a few hundred temporary ByteArray objects of large sizes, failure to report the additional memory cost may cause the application's memory consumption to grow and grow (because the script engine thinks they are "cheap" objects, the GC won't kick in). Reporting the correct size can be difficult (or impossible) in some cases. For example, it's difficult to predict the total amount of system memory & resources consumed by a QImage. But even reporting a heuristic / approximate cost can be better than reporting no cost. Task-number: QTBUG-6238 Reviewed-by: Simon Hausmann
| | * | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | | | | | | | | | | | | | | | Reviewed-by: Morten Sorvig
| | * | 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
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| | * | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/ / | | | | | | | | | | | | this fixes associating..
| | * | Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | | | | | | | | | | | | | | | (The .pro file name must match the dir name)
| | * | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | | | | | | | | | | | | | | | Resources are not allocated on error. Only free on success.
| | * | 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
| | | | | | | | | | | | | | | | Task-number: QT-3150
| | * | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| | | * | Update changelogThiago Macieira2010-03-241-0/+10
| | | | |
| | | * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2414-38/+43
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four-way merge: take the qt-qml.git#4.7 branch version (which uses fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1. Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | | * | | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QElapsedTimer doesn't initialise itself on construction, which means we were actually depending on uninitialised data. QTime does initialise itself to NullTime. This means the test didn't actually work if you ran it precisely at midnight... Reviewed-By: Trust Me
| | | * | | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NONCLIENTMETRICSW::iPaddedBorderWidth member is supported only on Windows Vista and above. So when calling the SystemParametersInfo for SPI_GETNONCLIENTMETRICS on Windows XP, the size for that member needs to be removed from NONCLIENTMETRICSW::cbSize. Task-number: QTBUG-8639 Reviewed-by: Thierry
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2416-213/+435
| | | |\ \ \
generated by cgit v0.12 at 2025-01-08 20:09:47 (GMT)