diff options
Diffstat (limited to 'examples/painting/shared')
| -rw-r--r-- | examples/painting/shared/arthurwidgets.cpp | 7 | ||||
| -rw-r--r-- | examples/painting/shared/hoverpoints.h | 2 | ||||
| -rw-r--r-- | examples/painting/shared/shared.pro | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/examples/painting/shared/arthurwidgets.cpp b/examples/painting/shared/arthurwidgets.cpp index b3c75f0fc4..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.pixmapData()->classId() == QPixmapData::X11Class && !xRenderPixmap.x11PictureHandle(); -#endif } diff --git a/examples/painting/shared/hoverpoints.h b/examples/painting/shared/hoverpoints.h index aff5d2ac75..af755a2a50 100644 --- a/examples/painting/shared/hoverpoints.h +++ b/examples/painting/shared/hoverpoints.h @@ -42,7 +42,7 @@ #ifndef HOVERPOINTS_H #define HOVERPOINTS_H -#include <QtGui> +#include <QtWidgets> QT_FORWARD_DECLARE_CLASS(QBypassWidget) diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro index e996956880..8fc58ae814 100644 --- a/examples/painting/shared/shared.pro +++ b/examples/painting/shared/shared.pro @@ -3,7 +3,7 @@ CONFIG += static contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl + QT += opengl widgets } build_all:!build_pass { @@ -11,7 +11,7 @@ build_all:!build_pass { CONFIG += release } TARGET = demo_shared -QT += gui-private +QT += widgets SOURCES += \ arthurstyle.cpp\ |