Changeset 846 for trunk/src/plugins/graphicssystems/openvg

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/graphicssystems/openvg/main.cpp (modified) (1 diff)
• src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp (modified) (4 diffs)
• src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h (modified) (1 diff)

trunk/src/plugins/graphicssystems/openvg/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -43 +43 @@
 #include <QtOpenVG/private/qpixmapdata_vg_p.h>
 #include <QtOpenVG/private/qwindowsurface_vg_p.h>
+#if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
+#include <QtGui/private/qwidget_p.h>
+#endif
+#include <QtGui/private/qapplication_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -48 +52 @@
 QVGGraphicsSystem::QVGGraphicsSystem()
 {
+    QApplicationPrivate::graphics_system_name = QLatin1String("openvg");
 }
 
@@ -65 +70 @@
 QWindowSurface *QVGGraphicsSystem::createWindowSurface(QWidget *widget) const
 {
+#if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
+    QWidgetPrivate *d = qt_widget_private(widget);
+    if (!d->isOpaque && widget->testAttribute(Qt::WA_TranslucentBackground))
+        return d->createDefaultWindowSurface_sys();
+#endif
     return new QVGWindowSurface(widget);
 }

trunk/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)