| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
|
|
|
|
|
|
|
|
| |
Also emit the signal at the very end, so people can rely on the resize
event to adjust some stuff in their item.
Reviewed-by:yoann
(cherry picked from commit 3ee89bc0830f69d44f272eff5a0c886bff33c92e)
|
|
|
|
| |
(cherry picked from commit 30d6f7ed29a2a5723387768cfe82a807a2724b8b)
|
|
|
|
|
|
|
|
|
| |
If the item is removed from the scene in response to the FocusOut event
of the previous item don't continue attempting to set focus.
Task-number: QTBUG-12620
Reviewed-by: Michael Brasser
(cherry picked from commit 7f2c9d716cba375ee3e576513898a39b3f2c39a5)
|
|
|
|
|
|
|
|
|
|
| |
Sharing a NOTIFY signal can cause binding loop warnings with no apparent
cause.
Task-number: QTBUG-12333
Reviewed-by: Aaron Kennedy
Reviewed-by: Michael Brasser
(cherry picked from commit 5d5feaa86f3933a1e89b53267953b86e2b0459ed)
|
|
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
(cherry picked from commit 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe)
|
|
|
|
|
|
|
|
|
| |
This fixes a crash when a static QWidget is destroyed after the QApplication
object.
Task-number: QTBUG-12025
Reviewed-by: Zeno Albisser
(cherry picked from commit 475a3c275ba173cb130a838b6053cb45d405887e)
|
|
|
|
|
|
|
|
|
|
| |
The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.
Reviewed-by: Aaron Kennedy
(cherry picked from commit 21806ff0921641b4e4d9d39721ab4ebeae74dddc)
|
|
|
|
|
| |
Task-number: QTBUG-12132
(cherry picked from commit d9f5b8742f84124c3c0e2bdbd7b860dce2bc2225)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only happens when the ItemHasNoContents and ItemClipsChildrenToShape
flags are set. Problem is that items with no content are threated as 'dummy'
items, which means they are never drawn or 'processed' otherwise, so the
cached bounding rect is not reliable/usable. This means that in case of
changing the geometry of such items, its children always have to take
care of invalidating the occupied areas and the update can not be
clipped to the item's bounding rect.
Regression after commit: c1c7dbf2
Auto test included.
Task-number: QTBUG-11504
Reviewed-by: yoann
(cherry picked from commit 4df9c96e2c213c39924e22e02621b0c61e83f8fe)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These classes create a new QWidget and assign it to a static pointer
which is never cleaned up. Using Q_GLOBAL_STATIC ensures that they are
deleted on library unload. This is really just a cosmetic change that
removes a leak warning - the real fix should be to find a way to not
use a new QWidget like this. It seems odd that QGraphicsLayouts, which
don't use QWidget in any other way, should depend on QWidget like this.
Task-number: QTBUG-10768
Merge-request: 741
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
(cherry picked from commit ea6a5146397b668bf535ee7249bd4262d6185234)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Crashed because tabFocusFirst could end up being a dangling pointer when
removing an item from the scene before deleting it.
When setting tabFocusFirst in fixFocusChainBeforeReparenting, we now
check that the item is in the scene. If it is not, tabFocusFirst is set
to 0.
Autotest included.
Task-number: QTBUG-12056
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit 7d09f690d5b4c56699092444665d1879deb86a6e)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When setting focus on an item, subfocus chain was previously updated
only for items with a common ancestor. We now make sure that this chain
is updated also for the previously focused item (possibly not sharing
any common ancestor with the newly focused item).
Autotest included.
Task-number: QTBUG-12112
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit b5b011a181bd187dcef5ee8f46a3ac2c5dc2e09c)
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (51 commits)
Symbian on Linux: $QTDIR/bin is not necessarily in the path.
Updated Symbian def files with new EGL exports.
Added another missing EGL stub.
Fixed compilation on Symbian.
Added missing EGL stub function.
Got rid of unused variable compiler warning.
QGLWindowSurface support for partial updates via EGL_NOK_swap_region2
Adding func prototypes for EGL_NOK_swap_region2 extension.
Check for EGLSurface leak only when paint device is a QGLWidget.
Fixed bug in drawTiledPixmap when width of pixmap matches target rect.
Update def files for symbian
Improved performance of 16 bit memrotates using NEON instructions.
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (39 commits)
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
Add QPixmap::fromImageReader() to decode arbitrary images in place.
Add missing license header.
Added textureUpload benchmark to the GL benchmarks
Fixed a crash in menubar with invisible actions
Fixed ARM .def files.
Doc: QSettings::sync() imports changes made by other processes.
Made -graphicssystem trace work with Qt::TextBypassShaping flag.
Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
Add a manual test for regular widget interaction with the table.
New variant of ::createPixmapData with origin for QGraphicsSystem.
EGL plane levels are the same as all other GL backends.
Need to access extensionFuncs in subclasses too.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This flag allows you to create a non-focusable item that can be clicked
on without changing the focus. This is also possible to achieve by
using focus scopes / panels, however the implementation is then way
more complex. Thew new flag is tailored for simple uses cases where
you simply want to stop the propagation and nothing more.
Auto test included.
Task-number: QT-3499
Reviewed-by: yoann
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (62 commits)
Don't access uninitialized value.
Added SET_BINDING message to QDeclarative debugger protocol
Add ListView.nextSection attached property
Remove the old font.outline documentation
Docs - add more links to relevant examples
Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't
Indicate default sizing option in qmlviewer
Plug QdeclarativePixmapCache canceled request leak.
update qml.qch to version 4.7
Undefined is undefined, and now qml warns about it
Fix so window will resize with the root object (broken by
Avoid duplicate code for testing initial sizes
Remove an unnecessary connect() in TextInput
Ensure micro focus is updated in TextEdit and TextInput
Fix flow layout not taking into account whether it's width and height are implicit or not.
Avoid binding loop.
Ensure Loader item change listener is removed when Loader is destroyed
Adapt all qmlviewer testcases to the code changes in the actual viewer.
Stop QMLLauncher from crashing on exit on Mac when quitting app via the
VisualDataModel hasModelChildren role shadowed user roles.
...
|
| |/
| |
| |
| | |
Task-number: QTBUG-11552
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes an issue in QtWebKit where scrolling with the wheel while
a combo box is opened cause the page to scroll while the popup don't
move. This patch either ignore the event on Mac or close the popup on
other platforms.
Reviewed-by: Yoann Lopes
|
|/
|
|
|
|
|
|
|
| |
This happens when the QComboBox popup gets closed by
QGraphicsScenePrivate::removePopup and then the QComboBox gets hidden.
If the QComboBox gets shown again, the popup will be shown as well
since it was not explicitly hidden.
Reviewed-by: Yoann Lopes
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added more DITA output to the XML generator
Usefully convert from QtScript object/array to QVariant
document QSslSocket::systemCaCertificates() change in changelog
Implement QIODevice::peek() using read() + ungetBlock().
Allocate the memory for QtFontSize when count > 1
doc: Added more DITA output to the XML generator
Defer allocation of GIF decoding tables/stack.
Make sure only started gestures can cause cancellations
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
Fix some kind of race condition while using remote commands.
Work around ICE in Intel C++ Compiler 11.1.072
Reduce the memory consumption of QtFontStyle
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The design is that calling setGestureCancelPolicy on the gesture
that is in starting state, and is accepted can cause other gestures
to be cancelled.
So change the logic to follow this, which means we won't try to execute
the cancel strategy if the gesture was never accepted and avoid the
crash detailed in the task.
Reviewed-by: Denis
Task-number: QTBUG-9771
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
doc: add note that items with width or height of 0 are not positioned.
Add test for model data changes.
clearFocus() shouldn't mess with focus if it doesn't have focus
Fix the N900 device orientation backend
Micro cleanup
Write TextInput.positionToRectangle docs.
Minor demo fixes
Fix autoScroll implementation
Move knowledge of QGraphicsObject out of qml engine
Stopping a flick resulted in the next click being consumed.
Enhance docs
Slight addition to the docs.
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
removing an item from the view caused the focus to change even if
the removed item didn't have focus.
Task-number: QTBUG-11341
Reviewed-by: Yoann Lopes
|
| |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed problem with wrong size hints when items were removed.
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The reason was that the row/column count was not updated after an item
was removed. (Note that qgraphicslinearlayout already did this, so we
just follow the same pattern, except that the code for
QGraphicsGridLayout is a bit more complex...
Task-number: QTBUG-10314
Reviewed-by: Alexis Menard
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| | |
4.7-staging1
|
| |
| |
| |
| |
| | |
Merge-request: 535
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes one minor regression in the last commit to QGraphicsIten::scroll:
if the expose region doesn't intersect with the cache pixmap, then
there's no point in removing it.
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With a null rect argument, QGraphicsItem::scroll() is supposed to scroll
the whole item. When using ItemCoordinateCache, currently the only
supported mode for scroll optimization, we simple scrolled the whole
cache pixmap. Problem: The cache pixmap has a border of 2 pixels. So we
scroll the contents _and_ the border. This leaves white/transparent
horizontal and vertical line artifacts when scrolling.
This change unifies the two cases - partial and full scrolling - into
one (shorter) approach that works without scrolling the margin as well.
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QGraphicsItem::scroll() scrolls the cache pixmap when cacheMode is
enabled (for ItemCoordinateCache only). Because the pixmap exists both
in the cache and in a temp QPixmap copy, the ref count is 2, so the
scroll operation has to do a deep copy. To avoid this, we remove the
pixmap from the cache before and reinsert it again after calling
QPixmap::scroll().
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
|
|/
|
|
|
|
|
|
| |
GestureOverride event was not respected when delivering to items in
GraphicsView.
Task-number: QTBUG-10745
Reviewed-by: Thomas Zander
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Wrong QGraphicsItem::childrenBoundingRect() when applying effects.
Fix a bug in QDirectFBPixmapData::fromImage
Replace memmove with memcpy
Fixed compilation of QtOpenGL.
Optimize initialization of QStaticText
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Problem was that we used the children's raw bounding rect instead of
using their effective bounding rect when calculating the bounds.
Auto test included.
Task-number: QTBUG-10756
|
|\ \
| |/
| |
| |
| | |
Conflicts:
doc/src/declarative/advtutorial.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This only happened with fully transparent ancestors (item's
effectiveOpacity() == 0.0). Problem was that we didn't take into
account the ancestors' opacity when removing an item from the scene.
More specifically: The calculated effective opacity for the item was
zero and we ignored update requests. We have to ignore the opacity if
any of the ancestors' ignoreOpacity bit is 1, which means the opacity
is set to 0 and the update request has not yet been processed.
Auto test included.
Task-number: QTBUG-10778
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits)
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
Fixing incorrect addition of public API symbols.
Removal erroneous inclusion of new Public API in qmacstyle.
Doc: design changes
qdoc: Fixed html error, but the problem is still there.
qdoc: Changed number of columns to 1. Oila!
Doc: Changes to the HTMLGenerator, style and js
remove dead code that will never get called.
add bytes and activeTime to corelwan.
Fix formating of license header.
fix irix build
clarify wording of warning message
...
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compile with xlC.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When given `flags |= foo | bar;', where `flags' is a bitfield, xlC says:
The bit-field "flags" cannot be bound to a non-const reference
`flags |= foo; flags |= bar;' works.
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Avoids unnecessary processing and assumptions we would not want to
preserve in the future.
Task-number: QTBUG-10217
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The biggest and most important issue was that QGraphicsItem::scroll
always accelerated the scroll without taking overlapping items or
opacity into account, which caused drawing artifacts. We can only do
accelerated scrolling if the item is opaque and not overlapped by
other items. There's no (sane) way to detect whether an item is
opaque or not (similar to Qt::WA_OpaquePaintEvent), which means we
cannot support accelerated scrolling unless the item is cached into
a pixmap (QGraphicsItem::setCacheMode).
The second issue was that QStyleOptionGraphicsItem::exposedRect always
contained the whole boundinRect() after an accelerated scroll
(even with the QGraphicsItem::ItemUsesExtendedStyleOption flag enabled).
Auto test included.
Task-number: QTBUG-8378, QTBUG-7703
Reviewed-by: yoann
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The boundingRect were in some cases not updated correctly, causing
full item exposure. Another problem was that we used QRectF::toRect()
instead of QRectF::toAlignedRect() when converting a QRectF to QRect.
This commit also reduces the probability of doing pixmap scaling since
we only pass an offset to QPainter::drawPixmap, instead of passing
target and source rects.
Task-number: Required by QTBUG-8378
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
|