[meego-commits] 7899: Changes to Trunk:Testing/meegotouch-compositor

[Kaitlin Rupert]

Hi,
I have made the following changes to meegotouch-compositor in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #7899:

  submit:   devel:qt-mtf:stable/meegotouch-compositor(r5) -> Trunk:Testing/meegotouch-compositor


Message:
    * Tue Sep 28 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.4.10
- Cleanup debug statements from mcompositor-black-screen-gtk.patch

**NOTE:  Submitting from a subproject of devel:qt-mtf, as the parent project is
in use for staging and testing version updates for the MTF packages.  These
updates arent' ready yet.

State:   new          2010-09-28T09:19:40 krupert
Comment: None



changes files:
--------------
--- meegotouch-compositor.changes
+++ meegotouch-compositor.changes
@@ -0,0 +1,3 @@
+* Tue Sep 28 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.4.10
+- Cleanup debug statements from mcompositor-black-screen-gtk.patch
+

++++++ deleted changes files:
--- mcompositor.changes

old:
----
  mcompositor.changes

spec files:
-----------

other changes:
--------------

++++++ mcompositor-black-screen-gtk.patch
--- mcompositor-black-screen-gtk.patch
+++ mcompositor-black-screen-gtk.patch
@@ -1,6 +1,7 @@
+From 17cde789a4d1d897e65e7ee6444e9d77f124d2de Mon Sep 17 00:00:00 2001
 From: Zhu, Yongsheng <yongsheng.zhu at intel.com>
 Date: Mon, 20 Sep 2010 10:38:55 +0800
-Subject: [PATCH] Fixes: - black screen on netbook
+Subject: [PATCH] Fixes: black screen on netbook
 
 black screen when running handset image on netbook which
 is using intel 945 system.
@@ -9,29 +10,24 @@
 2) vkb is shown
 3) app animation
 This is a workaround for the issue.
+---
+ src/mtexturepixmapitem_glx.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/src/mtexturepixmapitem_glx.cpp b/src/mtexturepixmapitem_glx.cpp
-index 7c14e3c..10385d8 100644
+index 34db153..e6f81f6 100644
 --- a/src/mtexturepixmapitem_glx.cpp
 +++ b/src/mtexturepixmapitem_glx.cpp
-@@ -290,11 +290,19 @@ void MTexturePixmapItem::paint(QPainter *painter,
-     Q_UNUSED(option)
-     Q_UNUSED(widget)
- 
-+    const char *version = (char*)glGetString(GL_VERSION);
-+    static bool checked = false;
-+    if (checked) {
-+        printf("GL version = %s \n", version);
-+        checked = false;
-+    }
-+
- #if QT_VERSION < 0x040600
+@@ -307,7 +307,8 @@ void MTexturePixmapItem::paint(QPainter *painter,
      if (painter->paintEngine()->type()  != QPaintEngine::OpenGL)
          return;
  #else
 -    if (painter->paintEngine()->type()  != QPaintEngine::OpenGL2) {
-+    if (painter->paintEngine()->type()  != QPaintEngine::OpenGL2
-+        && painter->paintEngine()->type()  != QPaintEngine::OpenGL) {
++    if (painter->paintEngine()->type()  != QPaintEngine::OpenGL2 &&
++            painter->paintEngine()->type()  != QPaintEngine::OpenGL) {
          return;
      }
  #endif
+-- 
+1.6.1
+