| 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>
|
| | |
|
|/
|
|
|
| |
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
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Calling QIconModeViewBase::initDynamicLayout() on the second and
successive segments would return QPoint(-1,-1), resulting in a
totally empty area rectangle for all the items while in
QIconModeViewBase::doDynamicLayout(). This rectangle is used to
initialize the BSP tree, and produces an arithmetic exception when
empty.
Furthermore, a rendering bug was also apparent when displaying the
first item of a segment while the last item of the previous segment
was hidden.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG-12308
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-10643
Task-number: QTBUG-11376
Reviewed-by: Jason Barron
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Trivial fix, valid formats have pixel format != Invalid, not ==.
Task-number: QTBUG-12337
Reviewed-by: Andrew den Exter
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed instability of tst_qdatetime::currentDateTime(Utc) on Linux
|
| | |
| | |
| | |
| | |
| | |
| | | |
It's possible for the second to tick over in gettimeofday() earlier than
time() (verified with strace). So this test needs an extra second of
leeway.
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix missing license header
Add test for getting a backtrace in QML
Doc: add link to new gettings started to index.html
Doc: Added new getting started document.
QtDeclarative: Give name to function bindings and signals.
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Cherry pick fix for MOBILITY-1234 from Qt Mobility.
Cherry pick fix for QTMOBILITY-408 from Qt Mobility.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Fix compilation error on Symbian^4.
Fix detection of OCC functionality.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
2f582953ecfc53f217317f58e4fc75b5b51a1126
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Make tst_qdatetime failures more verbose.
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Adding missing image
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | | |
into 4.7
|
| | | | | |
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't run the QGL test on systems that does not have GL support.
Remove an useless assert from comp_func_SourceOver_sse2()
QScriptEngineAgent: recompile all the function when installing a debugger.
QScriptDeclarativeObject: we need to save the current stack pointer.
QScriptValue::objectId(): do not assert if the value is not a cell
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
On a Mac that has no screens connected, it is possible to create
offscreen GL contexts, but not normal QGLWidgets. There are some
assumptions both in the tests and in the QGL module that this if you
can create one of them, you can create both.
The test now check if it can create a valid QGLWidget, if it can't
it will skip running all the QGL tests.
Task-number: QTBUG-12138
Reviewed-by: Prasanth
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Recompile all the function is necessary to ger the debug opcode that
notifies us when the position changes.
The change in CollectorHeapIterator.h is nessesary to get it work as
Debugger::recompileAllJSFunctions uses LiveObjectIterator,
LiveObjectIterator initialied m_cell to -1 and to ++(*this) in its
constructor. But as m_cell is of type size_t (unsigned) then the
< comparison will always fail as it is an unsigned comparison.
This was already fixed upstream in r54672
Reviewed-by: Jedrzej Nowacki
|
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Implement the composition function for CompositionMode_Plus with SSE2.
The macro MIX() can be replaced by a single instruction add-saturate,
which increase the speed a lot (13 times faster on the blend
benchmark).
Reviewed-by: Olivier Goffart
Reviewed-by: Andreas Kling
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed package creation when shadow building.
Fix crash caused by not clearing the QPixmapCache on application exit.
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed package creation when shadow building.
Fix crash caused by not clearing the QPixmapCache on application exit.
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
|