summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-084-11/+30
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0810-109/+84
| |\
| | * Revert "Support QList<QObject*> properties"Aaron Kennedy2010-04-089-105/+70
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d9161446bfad883c298d54a122e822c5e273a9c. This was a bad idea. It complicates the "property var" are not really JavaScript var problem. Some of the patch is valid, and it will be applied separately.
| | * Document behavior of conflicting when clauses.Michael Brasser2010-04-081-4/+14
| | | | | | | | | | | | Task-number: QTBUG-9371
| * | Don't emit clicked() after pressAndHold()Martin Jones2010-04-081-1/+1
| |/ | | | | | | Task-number: QTBUG-9676
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0810-75/+119
| |\
| | * Support QList<QObject*> propertiesAaron Kennedy2010-04-089-70/+105
| | | | | | | | | | | | | | | | | | | | | We already supported returning QList<QObject*> from methods, but there wasn't really much that could be done with the return value. This closes the loop on QList<QObject*> support by allowing them to be properties, and used as models.
| * | Fix setting of pointSize and pixelSize in different items.Martin Jones2010-04-082-6/+15
| | | | | | | | | | | | | | | | | | | | | Also ensure warning is issued regardless of the order both pointSize and pixelSize are set in the same item. Task-number: QTBUG-9665
* | | Give error if attempt to import from a version that is not installed.Warwick Allison2010-04-081-0/+12
| | | | | | | | | | | | | | | | | | (was done for builtins/plugins, but now also for qmldir-specified content) Task-number: QTBUG-9627
* | | Test actual error messages. Fix error messages. Test module-not-available error.Warwick Allison2010-04-081-2/+4
| |/ |/|
* | Update Repeater docs.Michael Brasser2010-04-071-5/+14
|/
* Build on Windows.Martin Jones2010-04-071-1/+6
|
* Make sure Loader doesn't leak when component has errors.Michael Brasser2010-04-071-3/+3
|
* Cleanup (remove QDeclarativeScriptClass)Aaron Kennedy2010-04-0713-142/+34
| | | | | QDeclarativeScriptClass only existed to make compiling against 4.6 and 4.7 easier.
* Disallow nested elements in ListModelAaron Kennedy2010-04-072-1/+9
| | | | QTBUG-6082
* Fix warningMartin Jones2010-04-071-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-078-17/+28
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0725-78/+259
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Cleanup minehunt example Keep track of the item count to avoid calling model->count() during batched changes Allow iteration over the Item.children property Add QListModelInterface::modelReset() signal and emit this in Compile Allow MouseArea.Drag.target to be reset. Document MouseEvent.accepted. Initialize drag movement correctly if drag.target is set after mouse move. Expand test. Honor the startDragThreshold in MouseArea drag. Don't crash if a target isn't specified for AnchorChanges. Optimization: Only allocate QScriptValue if we need too Crash: Assign context in CreateSimpleObject too Optimization: Minor object allocation speedup Optimization: Improve allocation strategy for QDeclarativeDeclarativeData
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the introduction of transform properties in QGraphicsItem, QGraphicsItem::transform() is no longer enough to get the correct transform of an item. No auto-test as it involves mouse dragging. Reviewed-by: Yoann Task-number: QTBUG-9295
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06237-5238/+6081
| | |\ \
| | | * | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the formats don't match the detch is unnecessary as operator= will anyways destroy the detached QImageData and substitute it with the newly created QImageData from convertToFormat. Task-number: QTBUG-9640 Reviewed-by: Trond
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | | * | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of the row is not only decided by the maximum height of the set of glyphs currently being added to the glyph cache, but also the height of the glyphs previously added to the current line in the glyph cache. To minimize the space used, we now calculate the maximum height for glyphs per line, and use this as the vertical advancement when positioning the next line in the cache. The change also removes a redundant test ((c_x + c.w > c.h) is caught earlier on and will always be false at this point.) Task-number: QTBUG-9176 Reviewed-by: Trond
| * | | | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5066
| * | | | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is with beginModalSession which reorders the windows and sends our window back. This patch queries the window level before calling beginModalSession and sets it after beginModalSession. Task-number: QTBUG-9392 Reviewed-by: Richard Moe Gustavsen
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-061-0/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a coding style issue of the GTK style Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
| | * | | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A tab was introduced in 16614121f8eff813efadc999a7db9ce47eae769e
| | * | | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-0/+5
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GTK Style A QHashableLatin1Literal was a bit too clever for sunstudio. Added and alternate constructor for sunstudio(ifdef) Should not affect other compilers. Other: Minor compile fixes, extra semicolon after macros etc. Merge-request: 547 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | | Disallow creation of attached objects Keys and KeyNavigationMartin Jones2010-04-073-35/+36
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Also adds qmlRegisterUncreatableType<>() to allow registration of named types that cannot be created. Task-number: QTBUG-9575
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0719-50/+166
|\ \ \ \
| * | | | Allow iteration over the Item.children propertyAaron Kennedy2010-04-072-3/+22
| | | | | | | | | | | | | | | | | | | | QTBUG-9645
| * | | | Add QListModelInterface::modelReset() signal and emit this inBea Lam2010-04-075-12/+23
| | | | | | | | | | | | | | | | | | | | XmlListModel when all data has changed.
| * | | | CompileAaron Kennedy2010-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | Apply the ~QObject QDeclarativeData logic to ~QWidget
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-07300-5506/+10227
| |\ \ \ \
| * | | | | Optimization: Only allocate QScriptValue if we need tooAaron Kennedy2010-04-013-10/+13
| | | | | |
| * | | | | Crash: Assign context in CreateSimpleObject tooAaron Kennedy2010-04-011-6/+6
| | | | | |
| * | | | | Optimization: Minor object allocation speedupAaron Kennedy2010-04-011-1/+7
| | | | | |
| * | | | | Optimization: Improve allocation strategy for QDeclarativeDeclarativeDataAaron Kennedy2010-04-0110-24/+101
| | | | | | | | | | | | | | | | | | | | | | | | This improves the declarative/creation/itemtree_qml benchmark by 6%
* | | | | | Keep track of the item count to avoid calling model->count() during batched ↵Martin Jones2010-04-073-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | changes
* | | | | | Allow MouseArea.Drag.target to be reset.Martin Jones2010-04-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9637
* | | | | | Document MouseEvent.accepted.Martin Jones2010-04-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9639
* | | | | | Initialize drag movement correctly if drag.target is set after mouse move.Martin Jones2010-04-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9638
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-07294-5432/+10118
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Don't crash if a target isn't specified for AnchorChanges.Michael Brasser2010-04-061-0/+12
| | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06223-4119/+4364
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-066-1/+462
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| | * | | | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
generated by cgit v0.12 at 2024-10-24 02:30:09 (GMT)