diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-06-10 11:21:48 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-06-10 11:21:48 (GMT) |
| commit | d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4 (patch) | |
| tree | a6dc8a1627fc14c777672f8616227c5f6a271d33 | |
| parent | f7abcf91ab997dc92518fbc324363e4a936a8c2d (diff) | |
| parent | 2255027e66a5b3284438de26ab64aaa941489665 (diff) | |
| download | Qt-d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4.zip Qt-d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4.tar.gz Qt-d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | demos/qtdemo/colors.cpp | 2 | ||||
| -rw-r--r-- | tools/linguist/shared/cpp.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
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"); 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; } |