diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 14:35:46 +0200 |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 14:35:46 +0200 |
commit | c53414e11b3f980f81a4470b3fb52f9d1aa80d56 (patch) | |
tree | 7d51540148af638b1c4fb7cda939d34739245457 /demos/qtdemo/colors.cpp | |
parent | f2b93868f48a3e2d6e462ca8a051ab47eefef49d (diff) | |
parent | 304bf2ef0a99882d2d969347f85a330523086fb3 (diff) | |
download | qt4-tools-c53414e11b3f980f81a4470b3fb52f9d1aa80d56.tar.gz |
Merge commit 'origin/4.5'
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
Diffstat (limited to 'demos/qtdemo/colors.cpp')
-rw-r--r-- | demos/qtdemo/colors.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp index b82de2f140..eaef0589c4 100644 --- a/demos/qtdemo/colors.cpp +++ b/demos/qtdemo/colors.cpp @@ -328,7 +328,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"); |