| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Change pen correctly when drawing cached text
Fix BorderImage painting at sizes less than margin size.
|
| |
| |
| |
| | |
Task-number: QTBUG-14568
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the width < left+right margins or height < top+bottom margins the
image was painted with the complete margins, resulting in an ugle
pattern. This change reduces the size of the margins proportionately,
which gives a much better appearance.
Task-number: QTBUG-15736
Reviewed-by: Yann Bodson
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix resource leak in QEgl::getCompatibleVisualld()
Fixed OpenGL state getting out of sync.
Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a
Declarative: Fix compiler warnings (Linux/g++)
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativepropertycache.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed OpenGL state getting out of sync.
Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a
Declarative: Fix compiler warnings (Linux/g++)
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When snapping is enabled the header was ignored and content would be
aligned with the first item rather than the header, when at the top of
the view.
Task-number: QTBUG-15710
Reviewed-by: Bea Lam
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15694
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15697
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15695
|
| |_|/
|/| |
| | |
| | |
| | | |
Task-number: QTBUG-15690
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13719
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Just add some Q_UNUSED for parameters or remove the variable we don't
need for the others.
Reviewed-by: Trust Me
|
|/ / |
|
|\ \ |
|
| |/
| |
| |
| | |
Also clean up some code uglyness in the process
|
|/
|
|
|
| |
Task-number: QTBUG-15623
Reviewed-by: Yann Bodson
|
|
|
|
|
|
|
| |
avoid an unnecessary copy
Task-number: QTBUG-15534
Reviewed-by: Martin Jones
|
|
|
|
| |
Task-number: QTBUG-15569
|
|
|
|
|
|
|
|
|
| |
This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab. This resulted
in a short jump before future events were handled by the nested item.
Task-number: QTBUG-15568
Reviewed-by: Bea Lam
|
|
|
|
|
| |
Task-number: QTBUG-14666
Reviewed-by: Aaron Kennedy
|
|
|
|
|
|
|
|
|
|
| |
Animating delegates results in the content height changing, which
may result in fixup being called if at the ends of the view, which
may in turn cause refill to be called, which will change the content
height, which repeats. Prevent this recusion from happening.
Task-number: QTBUG-14821
Reviewed-by: Bea Lam
|
|\ |
|
| |
| |
| |
| | |
Task-number: QTBUG-14761
|
| | |
|
| |
| |
| |
| |
| |
| | |
The dynamic meta object was not called because no parent meta object was called.
Reviewed-By: Aaron Kennedy
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
PathView needed to update internal item count when delegate was set.
VDM::count() didn't call into the internal VDM when querying count.
Task-number: QTBUG-14781
Reviewed-by: Alan Alpert
|
| |
| |
| |
| |
| |
| |
| | |
There are no visual items if there is no delegate.
Task-number: QTBUG-14781
Reviewed-by: Robert Griebl
|
| |
| |
| |
| | |
Task-number: QTBUG-15073
|
|/
|
|
| |
Task-number: QTBUG-15458
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
compile with quintptr instead of intptr_t
Enable OpenGL scissors test
Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno-psabi
Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait
QNAM HTTP: Ignore double content-length headers
Don't pack Harfbuzz structs, this causes unaligned access crashes.
qmake vcxproj generator: fix description of custom build tools
Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
qmake vcxproj generator: fix description of custom build tools
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Ignore double content-length headers
Don't pack Harfbuzz structs, this causes unaligned access crashes.
qmake vcxproj generator: fix description of custom build tools
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
intptr_t is defined in some C header that we don't include. I don't
know which one it is, but without it, it fails to compile with:
declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope
Reviewed-By: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the size of an item was less than one its endPosition() was less
than its position(), which caused incorrect layout (overlapping items).
Task-number: QTBUG-15242
Reviewed-by: Yann Bodson
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
The bounds behavior with ListView.StrictlyEnforceRange enabled should
not be affected by snapping behavior in fixup() since
ListView.StrictlyEnforceRange has a stronger positioning policy.
Task-number: QTBUG-15329
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15222
Reviewed-by: Yann Bodson
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
direction.
With < 4 items the shortest distance algorithm doesn't work since it
is equal distance either way.
Task-number: QTBUG-15260
Reviewed-by: Yann Bodson
|
|/
|
|
|
|
|
| |
Also documented Loader sizing behavior.
Task-number: QTBUG-14873
Reviewed-by: Michael Brasser
|
|\
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Keep source information when changing an expression
Flickable does not reposition its content when it is resized.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Copy over the source code location of an expression when it is changed throu
the debugging facilities. This enables JavaScript breakpoints to be hit even
after the source code of the function has changed.
Task-number: QTCREATORBUG-2824
Reviewed-by: Kai Koehne
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Call fixup() after Flickable resize to ensure contents are within
bounds.
Task-number: QTBUG-15173
Reviewed-by: Bea Lam
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Fixed tst_qpixmap::grabWidget autotest failure on QWS.
Doc: Fixing typo
Doc: Fixing typo
Doc: Fixing typo
Fixed tst_qwidget::testContentsPropagation auto-test failure.
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
...
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|