| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was that the span we stored in the multiCellMap was the
"effective" span (i.e. the given span subtracted with the number of
ignored rows it would span). Later we used that span to distribute its
size across all its cells. However, since the span now could be smaller
that the given span, we could sometimes fail to distribute to the last
span(s).
[ChangeLog][QtWidgets][layouts] Fixed a bug where spans sometimes didn't
distribute themselves to the last cells they covered.
Change-Id: I7bfbbe721f0ec4398be6a5f234c109ddfec18514
Task-number: QTBUG-43099
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
(cherry picked from qtbase/c9db6e52bc9bd9731159fcb4e95fca5cba01bc9c)
|
|
|
|
|
|
|
| |
Task-number: QTBUG-20132
Change-Id: Iab59fc9b61d4ca1bb2208c479a027da6eb0283a9
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/bf200fc948d89e1a735a8bcca879654028f944d2)
|
|
|
|
|
|
|
|
|
|
|
| |
Clear proxyWidget pointer in slot
QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot().
Task-number: QTBUG-29684
Task-number: QTBUG-33213
Change-Id: Ibdbd52aa810ca908e3d98daa00954345e7a93a48
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
(cherry picked from qtbase/ff2dbe609ef4482d66d1ecd135b4f53f6aff7e60)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, the topmost untransformable's scene transform, which
includes the item's position and local transformation, was used to
determine the item's anchoring position. This position was then
passed on to be multiplied by the item's transform again. This
works fine for toplevel untransformable items that don't have any
transform set at all, but those who do would have their transforms
applied twice - one to determine the anchoring position, and again
to transform the item itself. Since only translation transformations
can affect the first operation (the anchoring pos), this bug only
applies to items that set ItemIgnoresTransformations and use a
local transform that includes translation.
Task-number: QTBUG-21618
Change-Id: I3f3c4f2357e2ca6cd0c75cb5b7e428c0803d9e73
Reviewed-by: Alexis Menard <alexis@webkit.org>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-30990
Change-Id: Iaf2dd7ed496625097daa05d5dc92ef5957574ee9
(Cherry-picked from qtbase/0b862e067756132225e33be09670631edd50d944)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was spotted while tracking down a similar bug related to spans.
This now also eliminates the Q_EXPECT_FAILs in
heightForWidthWithSpanning(), since it now finally works.
The problem was only for the maximum size, since the size of an ignored
row/column was min: 0, pref: 0, max: FLT_MAX (the default constructed
values for a QGridLayoutBox).
Change-Id: Ibb33c26ede40ed02edd26f596ba6133d59c9962f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/9d7ae6dfbe25fb70a362a4cf955c187cd24cb007)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a row/column is only used only because of the spanning of an item,
the cell should be treated as it didn't exist. We keep track of this
with the "ignore" bit array.
The old code would always start from the row/column at position 1.
In the attached testcase this made the effectiveRowSpan become larger
than actually needed.
Task-number: QTBUG-30255
Change-Id: Ief0e7018ee8e5ee36272ce075a43312ffeac7b91
(cherry picked from qtbase/f9e43c526a30ae3912adfe3d5cb781af5ddda4b0)
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A glitch in QGraphicsItem's logic made it update the focusScopeItem
pointer, but fail to notify the change to QDeclarativeItem through the
d_ptr->focusScopeItemChange() virtual function, hindering
QDeclarativeItem from emitting focusChanged() correctly for focus
scopes that do not have focus.
Two lines were moved, and a comment updated to reflect the reason
why the "return" is needed at this point. It's clear that the
calls to focusScopeItemChange() are unrelated to the return.
Task-number: QTBUG-29260
Change-Id: I12ba9161b16d34c3689401a92c86d2047989f7bd
(cherry picked from qtbase/6476d6728eb3cde8e4a5fd0eb607b92977932296)
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A focus scope has effective focus if one of its children is the focus item,
clearFocus() should remove effective focus from an item and its children
not just from the focus item.
Task-number: QTBUG-28328
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
(cherry picked from commit ab97a44b6ae5cc826460f3704669383afd398594)
Change-Id: Ib6f43b40091cb1bb1a0d5b8b9ac71e44f35b037b
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This assert has become invalid since commit 40fef403. After that commit, the
'origin' mentioned by the assert is not necessarily the first item of
cachedItemsUnderMouse, since it origin can be reassigned at line 5839.
cherry-picked from qt5 f4b80c1210e444ad7454abfb80ba166ce2e2a5f2
Change-Id: Iae264f5b301b4bf76b59c7262b06edb24c594ee5
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a parent item had its visiblity toggled, then the child item would
not update if the parent item had ItemHasNoContents and
ItemClipsChildrenToShape set. This is a common use case in declarative as
the root item has ItemHasNoContents set.
Task-number: QTBUG-26846
Change-Id: Id6592ebc4ba2caa4331a4a71f7247e40993131b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 49c251e0543ea80e69d1725bb08bb4dfe3f225ab)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When focused QGraphicsWidget is being hidden, it tries to move the
focus to next focusable widget by calling focusNextPrevChild(true). If
there is no such widget available, the focus is cleared altogether.
The logic used to rely on the return value of focusNextPrevChild to
decide if clearing the focus is necessary. This was incorrect because
the return value may be true also when the focus has actually moved
within the graphics widget in question rather than moving to the next
widget. This is the case at least when GraphicsWebView item is
focused. Thus, the focus could then be left on invisible item which was
a serious issue: elsewhere in the qgraphicsitem.ccp, it is assumed that
no visible item can point to invisible item with its subFocus pointer.
Such pointers will become dangling pointers once the pointed
graphicsitem is deleted, and the process will then crash as soon as the
focus is tried to be moved to another item.
Now, the logic has been modified so that it is explicitely checked
after call to focusNextPrevChild if the item being hidden still has
the focus. If this is the case, the focus is cleared. To be consistent,
the same logic is applied also when disabling a QGraphicsWidget. Having
focus on disabled item is not as severe issue as having it on invisible
item, but it is still wrong.
Task-number: ou1cimx1#995710
Change-Id: Ica32bc381befc3ccaac79fb4cf4d50c5d452fad0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
The commit caused a regression whereby tooltips may be shown even if the
mouse is not over the item if it has the Qt::ItemIgnoresTransformations
flag and the QGraphicsView had been scaled.
Task-number: QTBUG-17517
Task-number: QTBUG-22663
Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
| |
DEBUG macro is defined from command line for debug builds in WEC7.
Changed graphcisscene internal macro to have different name.
Task-number: QTBUG-22512
Change-Id: I3d2bb8b7a2741fe34397a1c3cc268c1f6c5593b3
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-12389
Task-number: QTBUG-16667
Task-number: QTBUG-6151
Task-number: QTBUG-8625
Task-number: QTBUG-19808
Task-number: QTBUG-12096
Task-number: QTBUG-1231
Task-number: QTBUG-21073
Task-number: QTBUG-8939
Task-number: QTBUG-20399
Task-number: QTBUG-20944
Task-number: QTBUG-7542
Task-number: QTBUG-22095
Task-number: QTBUG-11278
Task-number: QTBUG-15653
Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Symbian builds seem more strict about properly declaring exports than
other builds, so added proper exporting and importing to some
function declarations.
Task-number: ou1cimx1#957184
Reviewed-by: mread
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Delay focusScopeItemChange to after reparenting, to prevent
an invalid focusScopeItem pointer crash.
Task-number: QTBUG-21640
Reviewed-by: Martin Jones
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The scenario was this:
If you had a height for width item, and that item had a maximum
width of 50.
If you called
item->effectiveSizeHint(Qt::PreferredSize, QSizeF(100,-1));
it would return (100, ?), thus violating its own maximum width.
Merge-request: 1423
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There were a number of places in QtGui where doubles were used in
expressions due to the use of floating point constants in the
code. Many of these constants are now constructed as qreal, removing
the use of double operations where unneeded.
These changes have been limited to constants that have exactly the same
value whether double or float, to ensure that precision errors are not
introduced.
This should not affect any of the desktop platforms where qreal is
double. On Symbian, where qreal is float, appropriate autotests have
been run.
Task-number: QTBUG-4894
Reviewed-by: Sami Merila
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-21612
Reviewed-by: James Perrett
Reviewed-by: Magne Pettersen Zachrisen
Merge-request: 1396
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1360
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't invalidate a QGraphicsItem (neither its cache) when an update is
triggered because of a QGraphicsEffect attached to it.
Autotest for QGraphicsEffect extended with 2 cache invalidation tests
Merge-request: 2681
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Any QGraphicsTextItems in those tabs which are not the first tab of
QTabWidget, cannot get focus although the tab is current tab of
QTabWidget.But the QGraphicsTextItem in the first tab of QTabWidget can
get focus. i.e. a focus frame (dotted box) appears around the
QGraphicsTextItem. Those QGraphicsTextItems which cannot get focus can
get focus only after the main window is minimized and then maximized.
i.e. After that, a focus frame appears around it.
Task-number: QTBUG-19680
Merge-request: 2676
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2646
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
|
|/ /
| |
| |
| |
| | |
Task-number: QT-4333
Reviewed-by: Trustme
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It happened when the scene gets deleted after ~QApplication has been
called.
test case:
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
QGraphicsScene *scene = new QGraphicsScene(&a);
return 0;
}
Reviewed-by: Gabi
|
|\ \ |
|
| | | |
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Reorder variable to eliminate warnings
Only compare styleNames if they are not empty
Add styleName to QFontDef comparison
|
| | |
| | |
| | |
| | | |
Reviewed-by: Frederik Gladhorn
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
When asking for relations, don't crash on children that don't return an interface.
Remove more inconsistencies with invisible.
QAccessibleToolButton::text should return accessibleName if set.
Remove stray semicolon.
Do not expose text when echo mode is not Normal.
Check validator when changing text using accessibility functions.
Fix some issues introduced in df6713b8f55fc007796f40.
Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX.
Avoid bogus accessibility focus events from menus.
Build fix for Mac OS 10.5
Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden
Notify a11y framework of FocusChanges for QGraphicsObject
Call updateAccessibility on the QGraphicsObject in updateMicroFocus
Fix updateAccessibility for QGraphicsObjects
Make accessibility work on Windows with alien
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 1b5cb7865eb8b48a2721f9b9c3ccd2fb25f8175d)
Reviewed-by: Frederik Gladhorn
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since QGraphicsObjects now can be in the a11y hierarchy, we should
treat them just like we treat widgets.
(cherry picked from commit 860745a4713b29857d14571572504da71a2ca077)
Reviewed-by: Frederik Gladhorn
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also fixed how the relayout is initiated. This is because we needed
to react differently to *posted* layout requests than to sent layout
requests. (sent ones should activate the layout, posted ones should
also resize the widget).
We therefore introduced the private slot _q_relayout() in order to
be able to make the distinction between posted and sent layout
requests. (Instead of posting we now invokeMethod with a queued
connection. In order to make it behave as it was compressed we also
have to refcount the number of calls to invokeMethod.)
(Note that refCount is 16 bits only, so it should not overflow
in sane cases. In the insane cases, the worst thing that will happen
is that it'll relayout the layout one extra time).
Make sure we resize QGraphicsWidget to be within its min,max sizes
when we change one of its constraints. (e.g. we change minimumSize to
something bigger than the current size). This did not work if the
widget did not have a layout.
Send a resize event whenever a QGraphicsWidget changes its size.
This did not happen before, because in the cases where a Layout Request
was sent, we did not send a resize event. This patch changes that, so
that when we send a resize event, we do not send a Layout Request
event.
This means that a Layout Request event is now *only* sent in order to
tell a widget to relayout its children (but the widgets size was not
changed, that's why we cannot send a resize event in that case)
Also includes a unit test, and a fix to make sure that we send a resize
event when we resize due to the sizehint changing followed by a setPos
command.
Added autotests for this. (and changed some)
Many thanks to John Tapsell and Stanislav Ionascu for help.
(autotests were provided by them).
My poor explanation did not convince Frederik 100%, but he is
"convinced enough" :)
Reviewed-by: Frederik Gladhorn
|