From 941a03814a5f8f7be93425f71ee65a4222d16899 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 10 Jun 2009 12:28:10 +0200
Subject: don't let comments weaved into strings confuse us

Reviewed-by: TrustMe
Task-number: 254260
Testcase: 323072@p4
---
 tools/linguist/shared/cpp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/linguist/shared/cpp.cpp b/tools/linguist/shared/cpp.cpp
index 0aab661..541543f 100644
--- a/tools/linguist/shared/cpp.cpp
+++ b/tools/linguist/shared/cpp.cpp
@@ -480,7 +480,9 @@ static bool matchString(QString *s)
     s->clear();
     while (yyTok == Tok_String) {
         *s += yyString;
-        yyTok = getToken();
+        do {
+            yyTok = getToken();
+        } while (yyTok == Tok_Comment);
     }
     return matches;
 }
-- 
cgit v0.12


From 2255027e66a5b3284438de26ab64aaa941489665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Wed, 10 Jun 2009 13:01:01 +0200
Subject: Fixed non-working animations under X11 with the raster
 graphicssystem.

Reviewed-by: jbache
---
 demos/qtdemo/colors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
index 883b0fb..048cb98 100644
--- a/demos/qtdemo/colors.cpp
+++ b/demos/qtdemo/colors.cpp
@@ -337,7 +337,7 @@ void Colors::detectSystemResources()
 #if defined(Q_WS_X11)
     // check if X render is present:
     QPixmap tmp(1, 1);
-    if (!tmp.x11PictureHandle()){
+    if (!tmp.x11PictureHandle() && tmp.paintEngine()->type() == QPaintEngine::X11){
         Colors::xRenderPresent = false;
         if (Colors::verbose)
             qDebug("- X render not present");
-- 
cgit v0.12