| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
| |
|
| |
|
|
|
|
|
|
|
| |
It was a bug/mistake to support that.
Merge-request: 2499
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: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
| |
Setting NoSystemBackground means that top-level widget backgrounds don't
get painted any more. Another work-around must be found to prevent
flickering.
Reviewed-by: Gunnar Sletta
|
| |
|
| |
|
|
|