diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-07-25 10:07:13 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-07-25 10:36:19 +0200 |
commit | e80b6619524a3720efb5fbe4c2307bec25a12ab8 (patch) | |
tree | e696a419177d79bd91aed474801a18081d0d94ac | |
parent | e026f767c9c600618104619d45ab6537f6988929 (diff) |
Build fix for examples.
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: I36f5a4088a39673a8e74a4d53ac83a42696af096
Reviewed-on: http://codereview.qt.nokia.com/2095
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r-- | examples/painting/shared/arthurwidgets.cpp | 7 | ||||
-rw-r--r-- | examples/painting/shared/shared.pro | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/examples/painting/shared/arthurwidgets.cpp b/examples/painting/shared/arthurwidgets.cpp index 2b8d6ebcee..c1abc4bbe7 100644 --- a/examples/painting/shared/arthurwidgets.cpp +++ b/examples/painting/shared/arthurwidgets.cpp @@ -51,8 +51,6 @@ #include <QTextBrowser> #include <QBoxLayout> -#include <private/qpixmapdata_p.h> - extern QPixmap cached(const QString &img); ArthurFrame::ArthurFrame(QWidget *parent) @@ -83,11 +81,6 @@ ArthurFrame::ArthurFrame(QWidget *parent) // QPalette pal = palette(); // pal.setBrush(backgroundRole(), m_tile); // setPalette(pal); - -#ifdef Q_WS_X11 - QPixmap xRenderPixmap(1, 1); - m_prefer_image = xRenderPixmap.handle()->classId() == QPlatformPixmap::X11Class && !xRenderPixmap.x11PictureHandle(); -#endif } diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro index 18f1d72398..8fc58ae814 100644 --- a/examples/painting/shared/shared.pro +++ b/examples/painting/shared/shared.pro @@ -11,7 +11,7 @@ build_all:!build_pass { CONFIG += release } TARGET = demo_shared -QT += gui-private widgets +QT += widgets SOURCES += \ arthurstyle.cpp\ |