| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
RVCT 4 is far more strict with regards to symbol visiblity that RVCT
2.2, and will hide symbols unless all references have default visibility
in the object files. Update the various places in Qt code where the
symbol visibility was set incorrectly for DLL-based platforms (those that
use __declspec(dllimport) and (dllexport).
Note: QtWebkit and QtScript are fixed in different commits.
Task-number: QTBUG-9903
Reviewed-by: Jason Barron
|
| |
|
|
| |
Reviewed-by: trustme
|
| |
|
|
|
|
|
|
|
|
| |
The previous #ifdef logic had the entire body of fromNativeType() and
toNativeType() #ifdef'ed out meaning that the OpenVG graphics system
could not convert CFbsBitmap instances to VGImage instances. This was
obviously incorrect because this code has no dependancy on RSgImage (or
EGL) and should therefore be outside of the #ifdef.
Reviewed-by: TrustMe
|
| |
|
|
|
|
|
|
|
| |
Symbian have changed the implementation of RSgImage to be more
lightweight and have moved it to a new library. This patch changes Qt's
usage of RSgImage to the new version and fixes some minor code style
issues.
Reviewed-by: Aleksandar Sasha Babic
|
| |
|
|
|
|
|
|
| |
QEglContext::display() is a static function, and exported as such.
qpixmapdata_vg.cpp and qwindowsurface_vgegl.cpp referenced it as a non-
static function which made the linking of QtOpenVG.dll fail.
Reviewed-by: Jason Barron
|
| |
|
|
| |
functions.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |/
|
|
|
| |
Task-number: QTBUG-7015
Reviewed-by: Daniel Pope
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Some OpenVG GPU's have limitations on the amount of memory
available to create VGImage's. When the memory runs out,
vgCreateImage() will fail.
This change introduces QVGImagePool, which keeps track of all
QVGPixmapData image allocations and ejects least-recently-used
pixmaps when GPU memory is exhausted.
Task-number: QT-2554
Reviewed-by: trustme
|
| |
|
|
|
|
|
|
|
| |
If vgCreateImage() runs out of memory, then the drawPixmap()
will fail. But previously, it would also prevent future attempts
to call vgImageSubData() to populate the data when memory was present.
Task-number: QTBUG-6639
Reviewed-by: Sarah Smith
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Under S60, Qt will destroy the window surfaces of an application that
goes into the background, which frees up EGL surface objects. But the
VGImage's for pixmaps, and the EGLContext, were still using GPU memory.
This change keeps track of the number of widgets / window surfaces that
are in use and then calls hibernate() on all QVGPixmapData objects when
it goes to zero. Once all the VGImage's are destroyed, the EGLContext
should also be destroyed.
Task-number: QT-2555
Reviewed-by: Sarah Smith
|
| |
|
|
|
|
|
|
|
| |
When a pixmap's contents change in QVGPixmapData, only recreate
the VGImage in the GPU if the size is different than before.
This should help reduce GPU memory fragmentation.
Task-number: QT-2504
Reviewed-by: Sarah Smith
|
| |
|
|
| |
Reviewed-by: Gunnar Sletta
|
| |
|
|
|
| |
Task-number: QTBUG-5869
Reviewed-by: Sarah Smith
|
| |
|
|
| |
Reviewed-by: Sarah Smith
|
| |
|
|
|
|
| |
QPixmap::copy() now returns a pixmap with the same pixmap backend.
Reviewed-by: Gunnar Sletta
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtOpenVG was doing a lot of housekeeping to avoid having to
switch EGL contexts if the same surface was used over and over.
This housekeeping really belongs in the QEgl layer so that
QtOpenGL could potentially use it as well.
This change also adds some overrides for makeCurrent(),
swapBuffers(), and destroySurface() that take an EGLSurface
directly. This is the first step in separating EGL surface
management from context management.
Reviewed-by: Sarah Smith
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
We need a way to support converion to and from multiple native pixmap
types from multiple pixmap backends. Instead of adding more virtual
functions to QPixmapData, make the existing one more generic but pass
an opaque pointer and a type and do some internal casting.
Currently this function is Symbian only, but could easily be extended
to work on other platforms.
Reviewed-by: Aleksandar Babic
Reviewed-by: Jani Hautakangas
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This enables us to convert from and to new Symbian type of
graphics resource, namely SgImage. This only supported with
the OpenVG graphics system.
On other graphics systems this will return null QPixmap.
Conflicts:
src/corelib/global/qglobal.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_s60.cpp
Reviewed-by: Jason Barron
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
| |
Custom OpenVG pixmap filters written by users will need to access
the VGImage form of a QPixmap. The qPixmapToVGImage() function
is provided for this purpose, as a private API.
Reviewed-by: Sarah Smith
|
|
|
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
