summaryrefslogtreecommitdiffstats
path: root/src/openvg/qwindowsurface_vgegl.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-11 02:56:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-11 02:56:25 (GMT)
commite78d1cfd08e6502ed08d3e46cf62552c2641c8bf (patch)
tree9eab33ebd9202c57f6468db9ede627ddc301d2b0 /src/openvg/qwindowsurface_vgegl.cpp
parentbf521a9a5d7670944658e93fe462c72f800a04f1 (diff)
parente81d4d3e97180d4043789210af832620f23ef2fd (diff)
downloadQt-e78d1cfd08e6502ed08d3e46cf62552c2641c8bf.zip
Qt-e78d1cfd08e6502ed08d3e46cf62552c2641c8bf.tar.gz
Qt-e78d1cfd08e6502ed08d3e46cf62552c2641c8bf.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
Diffstat (limited to 'src/openvg/qwindowsurface_vgegl.cpp')
-rw-r--r--src/openvg/qwindowsurface_vgegl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp
index 9c44545..693312a 100644
--- a/src/openvg/qwindowsurface_vgegl.cpp
+++ b/src/openvg/qwindowsurface_vgegl.cpp
@@ -177,7 +177,8 @@ void qt_vg_unregister_pixmap(QVGPixmapData *pd)
pd->prev->next = pd->next;
} else {
QVGSharedContext *shared = sharedContext();
- shared->firstPixmap = pd->next;
+ if (shared)
+ shared->firstPixmap = pd->next;
}
}