summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-30130-4108/+4108
|
* cleanupYann Bodson2009-10-3012-12/+15
|
* cleanupYann Bodson2009-10-3016-41/+12
|
* improve clock exampleYann Bodson2009-10-307-37/+41
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-293-7/+47
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-2996-700/+2457
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Add local highscores to SameGameAlan Alpert2009-10-293-7/+47
| | |
* | | Add attached properties typeinfoAaron Kennedy2009-10-292-0/+2
| | |
* | | Testcase for warnings at shutdownAaron Kennedy2009-10-292-0/+30
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-2920-501/+297
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Save a little more memory.Martin Jones2009-10-293-13/+15
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-2912-466/+250
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-29184-8441/+21638
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Remove duplicated docAlan Alpert2009-10-291-78/+0
| | | | | | | | | | | | | | | | global object functions are now in globalobject.qdoc
| | | * Merge QmlComponentJS into QmlComponentAlan Alpert2009-10-299-319/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | createComponent() and Component{} are now the same, and so Component{}s can now be passed around for use in script. Also this commit fixes the minor bug QT-2386
| | * | DocAlan Alpert2009-10-291-2/+2
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-28122-358/+817
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/globalobject.qdoc
| | * | | Fill out QML global object documentationAlan Alpert2009-10-284-118/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the documentation for functions on the global object from qmlengine.cpp to globalobject.qdoc (so that qdoc actually generates them). The XmlHttpRequest documentation is still just a stub.
| | * | | Minor cleanup of global objectAlan Alpert2009-10-282-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | removed desktopServices member, changed openUrl to openUrlExternally and placed it on the Qt object.
| * | | | Store filename as a QUrl rather than convert to QString.Martin Jones2009-10-293-12/+12
| | | | | | | | | | | | | | | | | | | | Saves about 700KB heap in samegame.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-2991-807/+21401
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Avoid unnecessary viewport scrolling when bringing currentItem into view.Martin Jones2009-10-292-10/+20
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2399
* | | | | Merge branch '4.6' of ../qt-widget-team into kinetic-declarativeuiAaron Kennedy2009-10-291-2/+2
|\ \ \ \ \
| * | | | | Compile with -no-qt3supportAaron Kennedy2009-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: andreas
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into ↵Aaron Kennedy2009-10-2984-596/+2229
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | kinetic-declarativeui
| * | | | Fix warning in qvariant.h header + make sure QVariant in QVariant works as ↵Olivier Goffart2009-10-282-27/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected Also add more test Reviewed-by: Thierry
| * | | | Fixed bug in QTableView spans.Gabriel de Dietrich2009-10-283-2/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the spans internal structure was left in an inconsistent state. Auto-test included. Bonus: spans consistency checking method. Task-number: QTBUG-5062 Reviewed-by: Olivier
| * | | | Fixed missing repaints on QTreeView when moving the mouseThierry Bastian2009-10-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..from the decoration to the item itself. QAbstractItemView can't handle that because it doesn't know anything about decoration. Reviewed-by: gabi
| * | | | Extand test of qBinaryFindOlivier Goffart2009-10-281-1/+16
| | | | |
| * | | | Use qLowerBound in qBinaryFindPascal Létourneau2009-10-281-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of qBinaryFind use 64bit arithmetics even on a 32bit system, which make it slow The docs mention qBinaryFind will find any occurence of the search value not necessarily the first one, but this is not case with current implementation So nothing prevents the use of qLowerBound Reviewed-by: Olivier Goffart Merge-request: 1513
| * | | | Wrong caching of opaque children in QWidget.Bjørn Erik Nilsen2009-10-283-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The opaque children cache was clipped to all the ancestors up to the top-level, which means whenever a widget changes geometry all the children must be invalidated. However, the bug was that we didn't invalidate the children, and that is of course slow so we don't want to do it either. A better solution is to only clip the children cache to the widget itself (widget->rect() instead of widget->clipRect()), and we can perfectly do this because the region we subtract the opaque children from is already inside the clipRect(). Auto-test included. Task-number: QTBUG-4245 (related to)
| * | | | Stabilize tst_QGraphicsView::optimizationFlags_dontSavePainterState2Bjørn Erik Nilsen2009-10-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Make sure the view is painted, otherwise the transforms are identity and comparisons don't make sense.
| * | | | Compile on 64bitOlivier Goffart2009-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jan-Arve
| * | | | Allow to put the central widget in a QMainWindow after it was shownThierry Bastian2009-10-282-6/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-1171
| * | | | Changing the time we wait for the end of the animationThierry Bastian2009-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We now wait for the animation duration + 100 (instead of 50). It makes tests more reliable on windows (and probably embedded)
| * | | | Make the QPropertyAnimation pass on windows by waiting slightly longerThierry Bastian2009-10-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Timers on windows are not accurate enough to "only" wait for the animation duration + 50.
| * | | | Fix initial focus bug in ItemIsFocusScope.Andreas Aardal Hanssen2009-10-282-14/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The task provides an example that doesn't gain input focus when started. The fix contains two parts: one is to allow items with focus scope ancestors to become focus items even if the scope is inactive. The other is to fix up the focusItem pointers on reparent. Before, the focus scopes' focusItem pointers always pointed to itself, or the next scope. Now these items are treated no differently than other items in that respect. The change has a performance impact when reparenting a large subtree that has a sub focus item onto another item (one more dig). Task-number: QT-2331 Reviewed-by: Alexis Menard
| * | | | Double-clicking a dock widget titlebar could make it disappearThierry Bastian2009-10-282-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it wasn't already docked on a mainwindow, its state would become unexpected. Task-number: QTBUG-945 Reviewed-by: gabi
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-289-20/+160
| |\ \ \ \
| | * | | | QSplitter would not show previously collapsed widgets.Gabriel de Dietrich2009-10-282-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After deleting or hiding the last non collapsed item in a QSplitter, none would be visible. We now check wether there is any non-hidden, collapsed widget, and set it to non-collapsed. Auto-test included. Task-number: QTBUG-4101 Reviewed-by: Olivier
| | * | | | Qt::escape(): also escape the quote (")Olivier Goffart2009-10-283-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amend previous commit by removing the duplicate function. The quote need to be escaped in attributes. Reviewed-by: Thomas Zander
| | * | | | Fix XML entities in QTextDocument::toHtml()Thorvald Natvig2009-10-283-9/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a QTextDocument contains an anchor with a & in it, this & is not escaped in the toHtml() function, meaning the resulting document can't be parsed as XML as it will contain invalid entities. Reviewed-by: Olivier Goffart Merge-request: 1753
| | * | | | Let QGraphicsItem set QObjectPrivate::wasDeleted when appropriate.Andreas Aardal Hanssen2009-10-283-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows children of QGraphicsObject-derived classes to check if the parent is being deleted by checking the private flag wasDeleted. Reverts 37b16d5cbb4e7bc534f690ebf50434d228b5ecfc, p4 change 9681, to allow QGraphicsItem to set QObjectPrivate's wasDeleted member before entering QObjectPrivate's destructor. The original code was in there to let the user know, via the console output, that QObject was double-deleted (e.g., when placing QObject on the stack, and also giving it a parent, so that if the parent is deleted first, bang). Reviewed-by: Aaron Kennedy Reviewed-by: Bradley T. Hughes
| * | | | | Merge branch 'fixes' of ↵Jan-Arve Sæther2009-10-281399-12672/+37285
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes3 Conflicts: src/gui/graphicsview/qgraphicsanchorlayout_p.cpp src/gui/graphicsview/qgraphicsanchorlayout_p.h
| | * | | | QGAL: Add test for David Boddie bugEduardo M. Fleury2009-10-261-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current simplification code does not handle sequences with anchors pointed to different directions could not be simplified together into a sequential anchor. A (10 / 20 / 50 ) B (20 / 20 / 20) Ex: o-----------------> <----------------o The reason we don't support it yet is shown in the example above. The resulting anchor would be either: Result_1 (-10 / 0 / 30) o------------------------------------> (or) Result_2 (-30 / 0 / 10) <------------------------------------o But the current implementation assumes no anchors can have negative sizes. Hopefully, the next commits will add support for it and then enable such simplification. :-) Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * | | | QGAL (QSimplex): Add constraints simplificationEduardo M. Fleury2009-10-262-4/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the simplex solver is able to remove fixed variables from its constraints as to improve its running time. The simplification consists of two actions that are done iteratively until no possible changes exist: 1st) Look for constraints of type Var == Constant Save constant as the trivial value of Var 2nd) Substitute known results in existing constraints Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | | QGAL (QSimplex): Make deep copy of constraints inside QSimplexEduardo M. Fleury2009-10-263-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to allow QSimplex solver to modify the constraints without breaking other parts of the code that rely on the original ones. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | | QGAL: Add QSimplexConstraint::toString() method for debuggingEduardo M. Fleury2009-10-261-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | | QGAL: Use constraints of type "equal" for fixed itemsEduardo M. Fleury2009-10-261-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We usually create two restrictions for each item, one to tell its size should be more than its minimum size and other enforcing it to be at most its maximum size. Now, for items that have fixed size, ie. minSize == maxSize, we create a single constraint telling its size should be equal its min/maxSize. The immediate advantage is to have one less constraint for each of these items. The indirect advantage is that the simplex solver can take advantage of such information. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | * | | | QGAL: clarify the usage of isLayoutAnchor bitCaio Marcelo de Oliveira Filho2009-10-262-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'isLayoutAnchor' is necessary only as a way to flag Layout internal anchors, i.e. anchors with the Layout as 'item' in the AnchorData structure. We don't need to propagate this bit when composing anchors. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>