Changeset 846 for trunk/src/gui/egl/qeglproperties_stub.cpp

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/gui/egl/qeglproperties_stub.cpp (modified) (5 diffs)

trunk/src/gui/egl/qeglproperties_stub.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)
@@ -44 +44 @@
 
 #include "qeglproperties_p.h"
+#include "qeglcontext_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -91 +92 @@
 }
 
+void QEglProperties::setDeviceType(int devType)
+{
+    Q_UNUSED(devType)
+    NOEGL
+}
+
+
 // Sets the red, green, blue, and alpha sizes based on a pixel format.
 // Normally used to match a configuration request to the screen format.
@@ -116 +124 @@
 }
 
+static void addTag(QString& str, const QString& tag)
+{
+    Q_UNUSED(str)
+    Q_UNUSED(tag)
+    NOEGL
+}
+
 // Convert a property list to a string suitable for debug output.
 QString QEglProperties::toString() const
@@ -129 +144 @@
 }
 
-void QEglProperties::dumpAllConfigs()
-{
-    NOEGL
-}
-
 QT_END_NAMESPACE