| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't write to the logger widget while the application is closing down.
Fix exponential behavior of QTextCursor::removeSelectedText
Fix test for N900 (ARM-specific SVG results).
docs - fix doc links, minor improvements
Fix TextEdit bitmap tests testing the wrong element
Make autotests work with qreal == float (in addition to double).
Fix TextInput text getting improperly clipped
fix doc links
Fix docs to link to the new QML Viewer page instead of the Runtime page
qmlviewer: Update the proxy factory when the user changes the proxy.
Don't accept *files* that exist when *directory* is required.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix exponential behavior of QTextCursor::removeSelectedText
Fix test for N900 (ARM-specific SVG results).
docs - fix doc links, minor improvements
Fix TextEdit bitmap tests testing the wrong element
Make autotests work with qreal == float (in addition to double).
Fix TextInput text getting improperly clipped
fix doc links
Fix docs to link to the new QML Viewer page instead of the Runtime page
qmlviewer: Update the proxy factory when the user changes the proxy.
Don't accept *files* that exist when *directory* is required.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
removeSelectedText adjusts all other cursors for every fragment
and block which gets removed. This becomes (for reasons yet
to be understood) exponential with loads of cursors (something
creator has for the semantic highlighting).
Done-with: Roberto Raggi
Reviewed-by: Simon Hausmann
|
| | | |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11790
Reviewed-by: Martin Jones
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
where applicable, and remove or rename references to 'qml' tool. Also
improve QML Viewer docs.
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11853
|
| | |/ |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Integrated:
|| <https://webkit.org/b/36618> || [Qt] LayoutTests/http/tests/appcache/fallback.html crashes ||
|| <https://webkit.org/b/39359> || [Qt] TiledBackingStore updates broken when not using resizesToContents mode ||
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Crash when dragging with mingw
Don't do alpha/opaque check which might cause a conversion and later pointer not-matching.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that there was a misalignment coming from the d&d code.
That called in the end our SSE optimized functions.
This code turns out to be calling QApplication::processEvents which
in the the calls the Qt event dispatcher for windows' processEvents
function. This function will now also always align the stack to 16
bytes and be SSE ready.
Task-number: QTBUG-11880
Reviewed-by: Zeno Albisser
|
| |/
| |
| |
| |
| |
| |
| | |
not-matching.
Merge-request: 724
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525
and gcc 4.5.
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
| | |
|
|/
|
|
|
|
|
| |
Fixes network access issue when running Qt applications in scratchbox
environment.
Task-number: QT-3528
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10
|
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/41451> || [Qt] Crash when destroying a QWebView with a QComboBox as its child. ||
|| <https://webkit.org/b/41157> || Spatial Navigation: refactor spatial-navigation-utils.js to support testing nested frames deeper than one level ||
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket::systemCaCertificates(): have one common case for all Unices
Fixed QX11EmbedContainer.
Improved a bit detection of a touch screen on Windows.
qdoc: Fixed invalid format in the html header.
link glu32 before opengl32
Stopped trying to output QML property list in 2 columns
|
| |
| |
| |
| | |
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Enforce the creation of the native window id for the focusproxy widget inside
the container to make sure we won't get a CreateNotify event to try to embed
the focusproxy itself.
Task-number: QTBUG-10809
Reviewed-by: Bradley T. Hughes
|
| |
| |
| |
| |
| |
| |
| | |
Use the bitfield description from MSDN instead of just checking if there is any
kind of digitizer.
Reviewed-by: Prasanth
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (51 commits)
Symbian on Linux: $QTDIR/bin is not necessarily in the path.
Updated Symbian def files with new EGL exports.
Added another missing EGL stub.
Fixed compilation on Symbian.
Added missing EGL stub function.
Got rid of unused variable compiler warning.
QGLWindowSurface support for partial updates via EGL_NOK_swap_region2
Adding func prototypes for EGL_NOK_swap_region2 extension.
Check for EGLSurface leak only when paint device is a QGLWidget.
Fixed bug in drawTiledPixmap when width of pixmap matches target rect.
Update def files for symbian
Improved performance of 16 bit memrotates using NEON instructions.
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | | |
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | | |
Use EGLint, not GLint here, as GLint might not be defined.
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | | |
Reviewed-by: Shane Kearns
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(if extension available).
Merge-request: 712
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 712
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(not QGLWindowSurface for example).
Merge-request: 722
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qt_memconvert's duff's device implementation assumes that count is > 0,
if count is 0 it will still blit eight pixels.
Reviewed-by: Trond
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make the memrotate functions a function pointer table so that we can
replace it with optimized versions, and implement an optimized NEON
version for the 90 and 270 rotations.
Measured performance improvement for a 400x400 16-bit pixmap was
17 % for 270 degree rotation and 11 % for 90 degree rotation.
Reviewed-by: Trond
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (39 commits)
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
Add QPixmap::fromImageReader() to decode arbitrary images in place.
Add missing license header.
Added textureUpload benchmark to the GL benchmarks
Fixed a crash in menubar with invisible actions
Fixed ARM .def files.
Doc: QSettings::sync() imports changes made by other processes.
Made -graphicssystem trace work with Qt::TextBypassShaping flag.
Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
Add a manual test for regular widget interaction with the table.
New variant of ::createPixmapData with origin for QGraphicsSystem.
EGL plane levels are the same as all other GL backends.
Need to access extensionFuncs in subclasses too.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (39 commits)
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
Add QPixmap::fromImageReader() to decode arbitrary images in place.
Add missing license header.
Added textureUpload benchmark to the GL benchmarks
Fixed a crash in menubar with invisible actions
Fixed ARM .def files.
Doc: QSettings::sync() imports changes made by other processes.
Made -graphicssystem trace work with Qt::TextBypassShaping flag.
Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
Add a manual test for regular widget interaction with the table.
New variant of ::createPixmapData with origin for QGraphicsSystem.
EGL plane levels are the same as all other GL backends.
Need to access extensionFuncs in subclasses too.
...
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-1853
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2422
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Each template argument need to be normalized separately. Else, the const
type of one argument may end up moved in the first argument.
(And then the compilation of the generated moc file would fail as the types
would not match)
Reviewed-by: Kent Hansen
Task-number: QTBUG-11647
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reflects now the real behavior of this function. Related to a false bug
report (QT-3481).
Reviewed-by: sroedal
|
| | | |\ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Thierry
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The slowdown factor is useful for debugging complex animations.
Setting it to 0 will stop all animations when slowMode is enabled.
Submitted-by: Lasse
Reviewed-by: Thierry
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Since raster uses QImage internal, QPixmap::fromImageReader() can use
conversion in-place of the image. This avoid a memory peak during the
conversion and is a bit faster.
Reviewed-by: Samuel Rødal
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Decoding in-place with QPixmap::fromData() has limitations, it cannot
be used with animated gif images, and the user has no control over the
parameters of the image reader.
Reader the image directly from the image reader allow us to do a better
job when loading images.
Reviewed-by: Simon Hausmann
Reviewed-by: Samuel Rødal
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
That would happen because the loop to find the next action when
navigating with the keyboard was not good enough.
Task-number: QTBUG-11823
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits)
Fixed ARM .def files.
Doc: QSettings::sync() imports changes made by other processes.
Made -graphicssystem trace work with Qt::TextBypassShaping flag.
Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
Add a manual test for regular widget interaction with the table.
New variant of ::createPixmapData with origin for QGraphicsSystem.
EGL plane levels are the same as all other GL backends.
Need to access extensionFuncs in subclasses too.
Export QGLWindowSurface too.
Export the QGLPixmapData so that we can override it in a custom graphics system.
Fixed autotest failure in QPathClipper on N900.
Fixed autotest failure in QPainter::setOpacity when NEON is used.
Fix compilation when configured with -no-xrender
Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.
Fixed some potential index-out-of-bounds issues in QImage.
Fixed autotest failure in fillRect_stretchToDeviceMode
Adding a known issue for VC2010 64 bit
Added a note to desupport VC2010 64-bit
Normalize integers when calling glVertexAttribPointer()
Add an implementation of comp_func_solid_SourceOver_neon() with Neon.
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Update for commits fd8e9eadd087d11b0a01d598132ccbb19667fa5a
and fb76a872e20bd0df8e7bbe9c039b7f20423c6f12, which add
private exports.
|