| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ibe649c6ca7f3dad96f1e624efdb2051eb724a6fb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
| |
Change-Id: I509c72c6a54f06cbecef556fd3f4d0bc9d1fc369
Reviewed-by: Samuel Rødal <samuel.rodal@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>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added setSwitchPolicy to MeeGo graphicssystem helper API.
|
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
Added automatic graphicssystem switching on meego when app is minimized.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed unescaped backslashes in testcase.prf
Fix `make check' for debug-and-release on Windows.
Move `check' target for autotests into testcase.prf
Revert "Backporting TESTARGS feature from 4.7"
Backporting TESTARGS feature from 4.7
Update copyright year to 2011.
embed copyright information in QtAssistantClient4.dll
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/features/qttest_p4.prf
src/script/utils/qscriptdate.cpp
src/script/utils/qscriptdate_p.h
tests/auto/qscriptvalue/testgen/testgenerator.cpp
tests/auto/qscriptvalue/tst_qscriptvalue_generated.cpp
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Merge-request: 993
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 1009
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2523
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2523
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
| |
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 926
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 926
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2502
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: 864
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>
|
| |
|
|
|
|
|
|
| |
MeeGo graphics system helper headers are now synced and the correct
include path and libraries are added to an application by doing QT +=
meegographicssystem helper in the .pro file.
|
|
|
|
| |
Also, this prevents hard-coding the path to the meego plugin.
|
| |
|
| |
|
| |
|
|
From http://www.gitorious.com/meego-graphics/meego-graphics
|