summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* These docs shouldn't have been removedAlan Alpert2009-08-191-0/+13
| | | | | Still ought to have the docs that explain how to subclass QFxBasePositioner effectively, at least for internal reference.
* Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-08-197-134/+56
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * doc cleanupYann Bodson2009-08-191-29/+0
| |
| * more docsYann Bodson2009-08-192-0/+31
| |
| * BorderImage docYann Bodson2009-08-181-20/+6
| |
| * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1814-62/+89
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | doc cleanupYann Bodson2009-08-183-85/+19
| | |
* | | Update Positioner TestsAlan Alpert2009-08-1914-380/+26
| | | | | | | | | | | | | | | | | | | | | Note that it still doesn't pass tests, due at least partially to an error in the test code. This change also slips in a change to the QLayoutItem example less of a bad example of how to integrate QGraphicsLayouts.
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-08-1914-62/+89
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Fix documentation for QmlDomObject::classNameKai Koehne2009-08-182-3/+3
| | | | | | | | | | | | | | | | | | The name of this method is also misleading, maybe rename it to just QmlDomObject::name and QmlDomObject::objectType() to QmlDomObject::qualifiedName() ?
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-1815-114/+89
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Make qml metatype db fully discoverable againKai Koehne2009-08-182-0/+28
| | | | | | | | | | | | | | | | | | | | Allow access to all registered types, and also expose the exact version range a type is provided for.
| | * | Rename filter to targets.Michael Brasser2009-08-186-51/+20
| | |/
| * | Resolve attached property typenames in correct context.Warwick Allison2009-08-184-8/+38
| | | | | | | | | | | | | | | | | | The imports of the component containing the reference to the attached property are used to resolve typenames, rather than assuming "Qt" namespace.
* | | More doc cleanupAlan Alpert2009-08-183-80/+31
| | | | | | | | | | | | | | | Positioners now don't refer to 'laying out' nor to the removed properties, like margins.
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-08-1840-690/+232
|\ \ \ | | |/ | |/| | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpositioners.cpp
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-184-21/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.h
| | * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-1815-513/+37
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Proposed changes following API review.Martin Jones2009-08-183-29/+28
| | | |
| * | | Some Text cleanup.Michael Brasser2009-08-183-16/+12
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-1824-541/+111
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1820-118/+152
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-1810-90/+78
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | MouseRegion API changes following review.Martin Jones2009-08-1810-28/+74
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1816-176/+110
| | |\ \ \ | | | |/ / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-17418-9425/+21277
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Doc cleanup.Yann Bodson2009-08-1713-433/+26
| | | | | |
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1761-524/+355
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Doc cleanup.Yann Bodson2009-08-172-80/+11
| | | | | | |
| * | | | | | Slightly change implementation of scope chain.Michael Brasser2009-08-183-27/+10
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Preparation for merge of QtScript's JSC backend.
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-18429-9581/+21356
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Change Item.contents to Item.childrenRect.Michael Brasser2009-08-189-72/+62
| | | | | |
| * | | | | No need to copy pixmap.Michael Brasser2009-08-171-18/+16
| | | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-08-188598-32003/+73296
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-179-161/+82
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-17418-9425/+21277
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | More namespace improvementsWarwick Allison2009-08-179-161/+82
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Store and find QML version ranges efficiently - Require version for QmlType-from-string - Removed unused version-ignorant QmlType-from-string functions - Some attached properties now resolve (eg. tst_qmlparser) - Still no better: - interfaces not versioned - some attached properties still hard-codec to Qt
| * | | | | Small fixes following API review.Martin Jones2009-08-174-5/+18
| | | | | |
| * | | | | Make pong example scale.Martin Jones2009-08-171-6/+6
| | | | | |
| * | | | | Add smooth: true to dial example.Martin Jones2009-08-172-4/+4
| | |/ / / | |/| | |
| * | | | Update more often to avoid odd intervals beteeen second movements.Martin Jones2009-08-171-1/+1
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-08-17412-9404/+21245
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | kinetic-declarativeui
| | * | | Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-163-24/+25
| | | | |
| | * | | Fixed compile.Rohan McGovern2009-08-141-3/+3
| | | | | | | | | | | | | | | | | | | | Put EffectParameter::userType back to EffectParameter::type.
| | * | | Fixed compile.Rohan McGovern2009-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Put QString::toReal back to QString::toDouble, there is no QString::toReal.
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-149-69/+206
| | |\ \ \
| | | * | | Autotest for correct word wrapping on text next to floating objectEskil Abrahamsen Blomfeldt2009-08-141-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We set the document's page size to be large enough to contain an image which is 100 pixels wide and one, but not two, instances of the word 'Foobar'. We then render HTML which contains a string with repeated occurrences of the word 'Foobar' next to a floating, right-aligned image which is 100 pixels wide. The layout should break on word boundaries, since this is the default in QTextDocument, and thus each text line should contain one instance of the word 'Foobar'. Task-number: 240325
| | | * | | Avoid wrapping outside word boundaries in QTextDocument unless necessaryEskil Abrahamsen Blomfeldt2009-08-141-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have a floating object which affects the width available to the text, we need to recalculate the width of the text line. In the code, the setLineWidth() call to do this would by default have WrapAnywhere as its wrap mode, even when this was not necessary. The code has now been moved so that WrapAnywhere is only used if we try to set the line width to match the available width and detect that the text is too wide (the natural text width exceeds the available space.) Task-number: 240325 Reviewed-by: Simon Hausmann
| | | * | | Reimplement qSwap and Q_DECLARE_SHARED differently.Thiago Macieira2009-08-146-41/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the use of Q_DECLARE_SHARED with d-pointers that are QExplicitlySharedDataPointer<PrivateClass>. Also, this enables swapping atomically QSharedPointers. Reviewed-by: Harald Fernengel
| | | * | | Perform license checks on source files.Frans Englich2009-08-141-19/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we only checked headers, but we actually care about source files too. This detects about 50 errors all over Qt. Discussed with Thiago.
generated by cgit v0.12 at 2025-09-07 01:35:52 (GMT)