| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Conflicts:
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylanddrmsurface.cpp
|
| |
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: jorgen
|
|
|
|
| |
before doing the QGLWidget event handling
|
| |
|
| |
|
|
|
|
| |
or the configuration is faulty, then don't change cursors
|
|
|
|
| |
Activate the window widget and update modifiers.
|
| |
|
|
|
|
| |
Reviewed-by: sroedal
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: Ralf Engels
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Before this patch, the slow down (overshoot) was a separate scroll segment.
This could lead to an actual acceleration when going into overshoot with a
very low velocity. The new approach is to just continue with the normal
scroll segment, until the max overshoot distance is reached and only add
one additional segment for the bounce-back animation to complete the
overshoot animation.
Reviewed-by: Ralf Engels
|
| |
| |
| |
| |
| |
| |
| | |
The problem is that a Xinerama 'screen' (as used by QDesktopWidget) does NOT
correspond to a Xrandr 'screen', so we have to convert via the root windows.
Reviewed-by: Ralf Engels
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QPainterPath can't handle NaNs/Inf inside coordinates, but instead of
safely ignoring or aborting an operation, it shows a warning and keeps
going on, with undefined behavior. Sometimes leading to infinite loops,
leaks or crashes (see qtwebkit example below).
This is particularly bad when QPainterPath is used to render content
from untrusted sources (web or user data). As an example, there's a
qtwebkit bug where the browser crashes when a particular SVG is loaded:
https://bugs.webkit.org/show_bug.cgi?id=51698.
Please note that "untrusted sources" doesn't apply only to network
sources. This behavior can probably be exploited on applications such as
file-browsers with previews enabled.
Task-number: QTBUG-16664
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
Merge-request: 1026
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Allow hard-coding the Unix temp path
Use file names in header include guards instead of namespace names
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This came as a requirement from a device manufacturer that couldn't
agree whether tmp is /var/tmp or /tmp, which lead to all kinds of side
effects. QSharedMemory token generation was broken depending on
where TMPDIR pointed to. This patch allows hard-coding a Qt-wide temp-dir
in qplatformdefs.
Reviewed-by: Robert Griebl
|
| | |
| | |
| | |
| | |
| | |
| | | |
Now the foreground color is displayed correctly when padding is set.
Reviewed-by: Olivier
|
| | |
| | |
| | |
| | |
| | |
| | | |
Now the foreground color is displayed correctly when padding is set.
Reviewed-by: Olivier
|
| |/
| |
| |
| |
| |
| | |
Added missing functions
Reviewed-by: TrustMe
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix double click event on Mac OS X.
Autotest for QVariant value types
Fix memory leak
Clarify Component.createObject(null) behavior.
|
| | |\ |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix double click event on Mac OS X.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix an issue where the double click would be
triggered even with different mouse buttons.
Task-number: QTBUG-8222
Reviewed-by: Richard Moe Gustavsen
|
| | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Autotest for QVariant value types
Fix memory leak
Clarify Component.createObject(null) behavior.
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Autotest for QVariant value types
Fix memory leak
Clarify Component.createObject(null) behavior.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16526
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Setting the parent of the returned item does not affect its object
ownership so care must be taken to ensure it is not garbage collected.
Task-number: QTBUG-16630
Reviewed-by: Aaron Kennedy
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
qRound: do not do operation with double when qreal is float
Fix the warnings when QBasicTimer are member of the ObjectPrivate
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
0.5 is double a literal, and they force computation on double
while it would be more optimized on qreal if qreal is a float
Task-number: QTBUG-16673
Reviewed-by: Thierry
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a class has QBasicTimer as member of a derived class QObjectPrivate,
the QBasicTimer will be destroyed after the timer has been cleaned.
The QBasicTimer will stop the timer in its destructor. But that means
that the same timer will be stoped twice, leading to ugly bugs.
Reviewed-by: Thiago
Reviewed-by: Brad
Task-number: QTBUG-16558
Task-number: QTBUG-16175
|
| |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When a script engine is about to be deleted all bound iterators should
be invalidated. Previously behavior of the class was not tested for the
case, so new test for QScriptValueIterator was added.
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ \
| | |/ / / /
| |/| / / /
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | | | | |
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
QNetworkProxyFactory::systemProxyForQuery() for Symbian
|
| | | |\ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
QNetworkProxyFactory::systemProxyForQuery() for Symbian
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNetworkProxyFactory::systemProxyForQuery() for Symbian
|
| | | | | | |
|