| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
Task-number: QTBUG-15405
Reviewed-by: Jason Barron
|
|
|
|
|
| |
Task-number: QTBUG-15779
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
| |
The margins could overlap, which caused overpainting. Ensure the
margins are always <= width or height /2.
Task-number: QTBUG-14657
Reviewed-by: Yann Bodson
|
|
|
|
|
| |
Task-number: QTBUG-15250
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
ListView header is not visible initially.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the header size was not set explicitly, but determined implicitly
from Text height, the view was not positioned so that the header
was visible when first shown.
Task-number: QTBUG-15599
Reviewed-by: Bea Lam
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.
Workaround for certain malformed PNGs that lack the final crc bytes
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QT-4103
Reviewed-by: trustme
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-4103
Reviewed-by: gunnar
|
|\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix two minor doc errors
|
| | |/
| |/|
| | |
| | |
| | | |
Task-number: QTBUG-14929, QTBUG-15739
Reviewed-by: TrustMe
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | | |
* '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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Contributed patch.
Task-number: QT-4335
Reviewed-by: Daniel Pope
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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++)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Forward begin / endNativePainting from the emulation paint engine.
Task-number: QTBUG-15498
Reviewed-by: Gunnar Sletta
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
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-15720
Reviewed-by: Martin Jones
|
| |_|/ /
|/| | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15690
Reviewed-by: Martin Jones
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve consistency in handling of aliases, bindings and value types
Move KeyNavigation example to snippets, plus some doc rewording
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-13719
|
| | | | | |
|
|/ / / / |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This variable cannot be dereferenced when it's zero, but let's silence
the compiler warning (GCC 4.4 on ARM).
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon: Fix use of ASCII casting in the PulseAudio support.
Phonon: Fix unused parameter warning
Phonon: Fix warning on casting from "false" to QFlags.
Phonon: Fix "value not in enum" warning with GCC 4.5.
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Instead, return Features();
|
| |/ / /
| | | |
| | | |
| | | | |
QMetaType::Float is not a member of QVariant::Type.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Fix strict-aliasing violation warning.
Fix warning about %x parameter type mismatch in EGL
Fix warning about address of a function being constant.
Fix warnings related to unused variables.
Fix silly "will be initialised after" warning.
Fix warning about mixing integral with non-integral type in ?:
Fix warning about use of uninitialised variable
Fix "value not in enum" warning with GCC 4.5.
Fix warnings with GCC 4.5: some cases are not part of the enum
Fix a race condition related to service acquisition.
QNetworkReply autotest: fix possible crash
QKqueueFileSystemWatcher: don't stop thread that isn't running
Fix QSettings auto test to use QTRY_VERIFY
tst_QFileSystemWatcher: Don't exit the event loop on first signal.
QPollingFileSystemWatcherEngine: Fix double report of directory change.
QKqueueFileSystemWatcherEngine: Use higher file descriptors.
QKqueueFileSystemWatcherEngine: Unlock mutex between two events.
QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).
QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.
QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Strict aliasing is violated here, so just silence the compiler (GCC)
by using an extension.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In OpenGL ES 2, these functions are always expected to be present, so
the address can never be zero. So only test for the function being
found if we tried to find it dynamicaly.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Just add some Q_UNUSED for parameters or remove the variable we don't
need for the others.
Reviewed-by: Trust Me
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
QMetaType::Float is not a member of QVariant::Type.
|
| | | | | |
|