| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\
| |
| |
| |
| | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Shouldn't use the (default) GL_REPEAT wrap mode on GLES2 unless
GL_OES_texture_npot is present.
Reviewed-by: Kim
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
or hidden.
Merge-request: 1287
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/xmlpatterns/expr/qevaluationcache_p.h
tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qtconfig/mainwindowbase.cpp
tools/qtconfig/paletteeditoradvancedbase.cpp
tools/qtconfig/paletteeditoradvancedbase.ui
tools/qtconfig/previewwidgetbase.ui
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |/
| |
| |
| |
| |
| |
| | |
Switch when the last _visible_ widget is destroyed (and also switch back
when a widget is mapped and there are no other visible widgets).
Reviewed-by: Armin Berres
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: (237 commits)
Fix animation tests after merge
Remove duplicated test.
Add missing test file.
Changing width of RTL positioner doesn't relayout
Fix TextInput auto test failure on mac.
PinchArea and Flickable don't work well enough together
Do not set focus unnecessarily at window activation in Symbian
QS60Style: Regression in drawing dialog background
QS60Style: Support menu separator (pt.2)
Fix auto test failure.
Support for new softkey in Symbian^3
Once Image sourceSize is set there is no way to clear it.
Rotation transform with NaN angle can cause crash
QSoftkeyManager auto test update
Fixed not switching to MeeGo graphicssystem.
Canceling image download while reading causes crash
Fix width of TextInput micro focus rectangle.
Return correct boundaries reasons from QTextBoundaryFinder.
GridView jumps to beginning of list when resized
Fixed rounding of coordinates pre-transformation in CG paintengine.
...
|
| |
| |
| |
| |
| |
| |
| | |
If two windows become maximized at once we might not switch, this is an
attempt at fixing that.
Reviewed-by: Armin Berres
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When a switch from HW rendering to SW rendering is done, all EGL
surfaces backing a live pixmap become invalid because EGL is
terminated. Thanks to a recent patch, all live images are now
automatically invalidated when SW rendering is activated.
Even with this mechanism in place, it is possible for the underlying EGL
surface to be different than what the live pixmap is expecting. This can
happen, for instance, if the X pixmap gets destroyed and a different X
drawable is created using the same XID. Even though this is an unlikely
scenario, it can result in a complete system failure if the surface
dimensions do not match and the live pixmap user ends up writing over
internal graphics driver structures.
This patch adds a safeguard which disallows locking EGL surfaces with
non-matching dimensions.
Fixes Harmattan bug NB#237138.
Merge-request: 2583
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If QMeeGoGraphicsSystem::createPixmapData is called with origin raster
pixmap data holding null image would result to null pointer deference
when trying to fetch data pointer.
To avoid the crash at graphics system switch pixmap data should be
checked if it is NULL.
Fixes: NB#237972
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Merge-request: 1160
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
| |
This lets the application control whether or not automatic switching
should be used, and also to completely disable switching if desired.
Reviewed-by: Armin Berres
|
|
|
|
|
|
|
| |
This will save GPU resources for applications that are in the
background for most of the time and only show a window now and then.
Reviewed-by: Armin Berres
|
|
|
|
|
|
|
|
|
| |
As the data may be aligned/padded by the X driver.
Fixes: NB#231246 : Incorrect stride used when QMeeGoLivePixmap width not multiple of eight
Merge-request: 1115
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
When all top-level widgets are minimized we switch to raster to reduce
GPU memory consumption. We switch back to graphicssystem meego when at
least one top-level widget is shown normally again. The switching only
applies when the runtime graphicssystem is being used. The switching
only applies when the runtime graphicssystem is being used.
Task-number: QTBUG-18013
Reviewed-by: Armin Berres
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QMeeGoLivePixmap fails to lock the EGL surface and texture after switch
to raster graphics system. The EGL surface is invalid after eglTerminate
call in switch. But QMeeGoLivePixmapData doesn't know about the switch.
Marking EGL surfaces and texture invalid after switch makes live pixmap
automatically recreate the surface when next time requiring live
pixmap.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Merge-request: 2571
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
| |
This is needed in the meego graphics system to support the shared image
fallback path (when using the raster graphicssystem). The flag is
internal.
Reviewed-by: Gunnar Sletta
|
|
|
|
|
|
|
|
|
|
|
| |
Dithering in QMeeGoPixmapData::imageToEGLSharedImage is now done using
Ordered Dithering, not anymore Floyd-Steinberg dithering.
This provides better overall results.
Fixes: NB#208927 - X dithering looks better than meego graphicssystem one
Merge-request: 1079
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
| |
If we can't access the qt_gl_share_widget() we should just create a
raster window surface. This might happen when creating the share widget
itself leads to creation of a window surface (which isn't really going
to be used anyways).
Reviewed-by: Michael Dominic K
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Not pixmap creation.
Merge-request: 988
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
| |
Also don't dither on edges.
Improves dithering over tiles/scaled smooth gradients.
Merge-request: 971
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
| |
already created.
Merge-request: 967
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
|
|
|
|
|
| |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
4444 16bit are too bad quality-wise.
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
| |
It was a bug/mistake to support that.
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
16bit.
Merge-request: 2496
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
| |
Moving code from qmeegopixmapdata there.
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2493
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 864
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
| |
(was a driver bug after all).
Merge-request: 864
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
| |
Was required to implement a new subclass to make this happen.
Merge-request: 863
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|