summaryrefslogtreecommitdiffstats
path: root/src/gui/embedded
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-14 12:54:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-14 12:54:02 (GMT)
commit3e4d8596edd8061a81f641df4f09d018b73c81f0 (patch)
tree9b474de460f44c65eba61b7b5b8c01dac22bf275 /src/gui/embedded
parentb371999d3e9c207047be6afda89d008b6cf04763 (diff)
parent62cd360b3f2ef9e9787359a9105fd805b721b49f (diff)
downloadQt-3e4d8596edd8061a81f641df4f09d018b73c81f0.zip
Qt-3e4d8596edd8061a81f641df4f09d018b73c81f0.tar.gz
Qt-3e4d8596edd8061a81f641df4f09d018b73c81f0.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
Diffstat (limited to 'src/gui/embedded')
-rw-r--r--src/gui/embedded/qscreenqnx_qws.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/embedded/qscreenqnx_qws.cpp b/src/gui/embedded/qscreenqnx_qws.cpp
index 705db7e..a0a697f 100644
--- a/src/gui/embedded/qscreenqnx_qws.cpp
+++ b/src/gui/embedded/qscreenqnx_qws.cpp
@@ -205,7 +205,7 @@ static bool createMemSurface(QQnxScreenContext * const d, int w, int h)
int ret = gf_surface_create(&d->memSurface, d->device, w, h,
GF_FORMAT_ARGB8888, 0,
GF_SURFACE_CREATE_CPU_FAST_ACCESS | GF_SURFACE_CREATE_CPU_LINEAR_ACCESSIBLE
- | GF_SURFACE_PHYS_CONTIG);
+ | GF_SURFACE_PHYS_CONTIG | GF_SURFACE_CREATE_SHAREABLE);
if (ret != GF_ERR_OK) {
qWarning("QQnxScreen: gf_surface_create(%dx%d) failed with error code %d",
w, h, ret);