| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
I removed some statics because else the test could not be run several times
Reviewed-by: Andreas Kling
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
"a:" is not a valid tagname. The function creating the element node
notices that and returns 0, but the parser ignores it and continues,
and then crashes later when processing the "text". This patch aborts
the parsing immediately when creating the element node failed and
fixes the crash.
Merge-request: 2431
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/gui/kernel/qt_s60_p.h
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/mediaobject/tst_mediaobject.cpp
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.
Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
A simple test application to set any combination of input method hints
on a QLineEdit widget. This makes it easier to debug when the original
report relies on webkit.
Task-number: QT-3681
Reviewed-by: Miikka Heikkinen
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Mac Phonon backend does not support opening a resource file via the
MediaSource(const QString &) overload. The MediaSource(QIODevice *)
overload must be used. The Symbian backend, on the other hand,
requires the former overload to be used.
Task-number: QTBUG-6562
Reviewed-by: trustme
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-6562
Reviewed-by: Justin McPherson
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* Removed Q_SKIP on Symbian
* Divided test into two, to exercise the two possible ways of providing
the resource path to Phonon::MediaSource
Task-number: QTBUG-6562
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/ /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't destroy ListModel child list nodes.
|
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | | |_|_|_|_|/ /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
These are owned by the root and must not be destroyed by child lists.
Task-number: QTBUG-12771
Reviewed-by: Bea Lam
|
| |\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fix memory leak in QtScript variable object
doc: Changed some titles so lists of contents sort better.
QSslSocket: fix security vulnerability with wildcard IP addresses
doc: Some reorganization of top page topic hierarchy.
Mac: Fix crash when using style to draw on other things than widgets
Doc: Adding radius support for CSS3 and webkit
Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
add performance comparisons to qregexp benchmark
configure: fix error message when calling config.status
Fix invalid memory write during recursive timer activation
Added comment about calendarPopup in setCalendarWidget function documentation.
doc: Fixed some qdoc errors.
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
XmlListModel doc fixes
Mention QML_IMPORT_TRACE in Modules docs
Merge sections about when property and default state
Explain Flipable example further
PathView required some diagonal movement before a drag was initiated.
doc: Fixed some qdoc errors.
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.
Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704
|
| | |\ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
add performance comparisons to qregexp benchmark
configure: fix error message when calling config.status
Fix invalid memory write during recursive timer activation
Added comment about calendarPopup in setCalendarWidget function documentation.
doc: Fixed some qdoc errors.
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
XmlListModel doc fixes
Mention QML_IMPORT_TRACE in Modules docs
Merge sections about when property and default state
Explain Flipable example further
PathView required some diagonal movement before a drag was initiated.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.
doc: Fixed some qdoc errors.
Add Ukrainian translation.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Commit eea84818e98af917d3cf2bf04ea17a416ef9d55e corrected some spelling
mistakes, one of which this test was relying on.
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: hjk
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The handler for one timer recurses the event loop, and the handler for
another timer removes the first timer, returning from the recursion and
the handler for the first timer causes an invalid write (since the timer
info for the first timer has been deleted).
Fix this by keeping an active reference in QTimerInfo (instead of just a
bool inTimerEvent). If this is non-zero, the timer is currently being
delivered, so we prevent more delivery. When a timer is removed and it's
activateRef is set, we clear it so that the delivery code knows now to
write to memory that's already been freed.
A side effect of this change is that we no longer need to track the
currentTimerInfo "globally" anymore, it can be a normal local variable
in the QTimerInfoList::activateTimers() function.
Task-number: QT-3553
Reviewed-by: olivier
Reviewed-by: joao
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't double-add item change listeners.
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When a Repeater was used as the child of an Item binding to childrenRect,
the item change listener was being added twice for the items created
by the Repeater.
Task-number: QTBUG-12722
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Rename Symbian generated mmp/mk files to include target in filename
Use ARGB32 premultiplied backing store format in Symbian^3
Register window types for Symbian system effects
Added $$MW_LAYER_SYSTEMINCLUDE to some autotests
Fix duplicate binary names issues in Symbian autotests
Fix some autotest deployments to work in case Qt is already deployed
Fix run and runonphone targets for projects that have TARGET with path
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Rename Symbian generated mmp/mk files to include target in filename
Use ARGB32 premultiplied backing store format in Symbian^3
Register window types for Symbian system effects
Added $$MW_LAYER_SYSTEMINCLUDE to some autotests
Fix duplicate binary names issues in Symbian autotests
Fix some autotest deployments to work in case Qt is already deployed
Fix run and runonphone targets for projects that have TARGET with path
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These autotests couldn't find e32svr.h in Symbian^3 env because that
header has moved.
Reviewed-by: TrustMe
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In Symbian each binary name must be unique as all binaries are stored
in the same directory on the device. Some autotests created helper
binaries that had same names on different tests, which caused
build and installation issues when building entire autotest project
tree.
Reviewed-by: Shane Kearns
|
| | | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
Reviewed-by: Shane Kearns
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Modified descriptions of QBasicTimer class and isActive() function.
Translation work for 4.7
Some more french translations.
Some french translations
doc: Re-introduced next/previous page links in the footer.
Doc: Fixing validation bugs
Removed duplicate case for const variable snippet.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
doc: Fixed some S60 qdoc errors.
doc: Fixed some missing images.
Adding Getting Started files. Auto test passes.
Changed width of the document. Part of the fix for QTBUG-12180
Revert "Doc: Adding GS QML example files"
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Adding a description for the Spectrum Analyzer demo. For QTBUG-12180
qdoc: added application flags in doc.pri and fixed QTBUG-12388
...
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Designer: Prevent rich text from being copied into style sheets.
QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction
qdoc: Removed three unused config variables.
qdoc: Cleaned up the application option specification and use.
Doc: Adding GS QML example files
Doc: Images for QML GS
Doc: Editied version of QML GS
Doc: Adding text to GS page
Fix link error when building Bearer application with Qt Mobility
Doc: nesting up orphant pages
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
the XML Schema dateTime type allows for an unlimited precision of
fractial time values; this fails for 4 or more digits when creating a
QTime. This patch takes only 3 digits of the time fraction into account,
since we cannot store more in a QTime or QDateTime anyway.
Reviewed-by: Olivier Goffart
Task-number: QTBUG-11559
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's the scene itself that acts as a focus scope, not the top-level
item.
Task-number: QTBUG-12682
Reviewed-by: Aaron Kennedy
|
| | | | | |
|
| |/ / /
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12649
Reviewed-by: Martin Jones
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed crash in concentric circles example
QDeclarativeDebug: use QueuedConnection in the packet protocol
Implement comp_Source with SSE2 when there is a const alpha
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On Atom, comp_Source is 280% faster with the SSE2 implementation.
Reviewed-by: Andreas Kling
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
SpringFollow was turned into SpringAnimation so it could be
used inside a Behavior. This patch completes the work and makes
it usable inside a transition.
This is the documented behavior of SpringAnimation, the patch
is essential to make SpringAnimation work consistently.
Reviewed-by: Michael Brasser
Task-number: QTBUG-12141
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
These formats had broken rgbSwapped() implementations:
argb8565, argb6666, rgb555, argb8555, rgb444, argb4444
Reviewed-by: Benjamin Poulain
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12142
Reviewed-by: Warwick Allison
This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor),
portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as
Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now
works on Symbian, but it's hidden when orientation mode is set to auto-orientation.
Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously
it only updated values between portrait and landscape. If your application only supports landscape or portrait
modes, just don't react to the inverted orientations.
Added orientation example screenorientation under examples/declarative.
The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait
to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows,
Linux and Symbian^3.
|
| | | |
| | |
| | |
| | | |
QTBUG-12590
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QDesktopServices crashes when accessing the NULL X11 variable
Revert "Fix the byte order in QImage::fill for 24bpp formats"
Fix crash when setting font decorations on text drawn with QStaticText
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change the behavior. (as it break tests like drawImage_task258776
and tst_QPainter::drawhelper_blend_color)
The bug it fixes is not considered importent enough
This reverts commit 121c5143f1002734ff7aa62785ff14e0e6612aae and
d8c6ae24f94133828f4f1b536538e69c5e438202
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_QPainter::drawImage_task258776
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This test was broken, and change 121c5143f1002734ff7aa62785ff14e0e6612aae exposed it.
Why would one check red == blue?
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the rendering of lines with the X11 paint engine
Fix the byte order in QImage::fill for 24bpp formats
QScript: remove JSC::JSLock
QScript: document/obsolete things that does not work since the move to JSC
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
On the X11 paint engine, when rendering lines with float coordinates,
the lines were one pixel off if the decimal was > 0.5.
This fixes the WebKit bug https://bugs.webkit.org/show_bug.cgi?id=42248
Autotest by Yoann Lopes.
Reviewed-by: Simon Hausmann
Reviewed-by: Yoann Lopes
Reviewed-by: Andreas Kling
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QImage::fill() was using BGR ordering for 24-bit formats, which is
always incorrect as QImage does not support BGR. qrgb888 is the
correct 24-bit helper class that does use the proper order.
Merge-request: 2440
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed build break on Symbian versions earlier than S^3
Fixed qsymbianbearer.qtplugin exports in s60installs.pro
Enabled tst_mediaobject::testPlayFromResource on Symbian
Added support to Phonon MMF backend for playback of Qt resource files
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6562
Reviewed-by: Justin McPherson
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
directly from the base state.
Make sure qmlExecuteDeferred is called on the state being extended.
Task-number: QTBUG-12559
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing image
Mention scope of id uniqueness
Update QML Documents example
add license header
doc: Add a note about QCoreApplication::applicationDirPath
Add license header
Add moving and flicking properties to PathView
Improve utility of QMLViewer
Add missing \l doc commands
Document elements that are focus scopes.
Remove use of shared NOTIFY signals in QGraphicsScale
Remove use of shared NOTIFY signals
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
PathView handles its own mouse interaction, but lacked properties
similar to those in Flickable to determine when it is stationary.
This made it impossible to start an animation when the view stops moving,
for example.
Task-number: QTBUG-12497
Reviewed-by: Warwick Allison
|
