diff options
Diffstat (limited to 'examples/painting')
28 files changed, 27 insertions, 30 deletions
diff --git a/examples/painting/affine/affine.pro b/examples/painting/affine/affine.pro index 817e5829c2..1441811851 100644 --- a/examples/painting/affine/affine.pro +++ b/examples/painting/affine/affine.pro @@ -3,7 +3,7 @@ HEADERS += xform.h contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl + QT += opengl widgets } SHARED_FOLDER = ../shared diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro index 110bf352b2..0e9c699698 100644 --- a/examples/painting/basicdrawing/basicdrawing.pro +++ b/examples/painting/basicdrawing/basicdrawing.pro @@ -15,6 +15,7 @@ symbian { TARGET.UID3 = 0xA000A649 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/painting/basicdrawing/renderarea.cpp b/examples/painting/basicdrawing/renderarea.cpp index 0906159e0e..87e6c187d3 100644 --- a/examples/painting/basicdrawing/renderarea.cpp +++ b/examples/painting/basicdrawing/renderarea.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "renderarea.h" diff --git a/examples/painting/basicdrawing/window.cpp b/examples/painting/basicdrawing/window.cpp index 072c3e08aa..6f750c45d1 100644 --- a/examples/painting/basicdrawing/window.cpp +++ b/examples/painting/basicdrawing/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "renderarea.h" #include "window.h" diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro index 3a552955b4..c8e5ab0af3 100644 --- a/examples/painting/composition/composition.pro +++ b/examples/painting/composition/composition.pro @@ -8,7 +8,7 @@ include($$SHARED_FOLDER/shared.pri) RESOURCES += composition.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl + QT += opengl widgets } # install diff --git a/examples/painting/composition/main.cpp b/examples/painting/composition/main.cpp index d6bc170a97..3c6a16aaf5 100644 --- a/examples/painting/composition/main.cpp +++ b/examples/painting/composition/main.cpp @@ -50,9 +50,6 @@ int main(int argc, char **argv) { // Q_INIT_RESOURCE(deform); -#ifdef QT_OPENGL_SUPPORT - QGL::setPreferredPaintEngine(QPaintEngine::OpenGL); -#endif QApplication app(argc, argv); CompositionWidget compWidget(0); diff --git a/examples/painting/concentriccircles/circlewidget.cpp b/examples/painting/concentriccircles/circlewidget.cpp index d801710b99..1ffab63944 100644 --- a/examples/painting/concentriccircles/circlewidget.cpp +++ b/examples/painting/concentriccircles/circlewidget.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "circlewidget.h" diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro index f4b1979ba9..a889673014 100644 --- a/examples/painting/concentriccircles/concentriccircles.pro +++ b/examples/painting/concentriccircles/concentriccircles.pro @@ -14,5 +14,6 @@ symbian { TARGET.UID3 = 0xA000A64A CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/painting/concentriccircles/window.cpp b/examples/painting/concentriccircles/window.cpp index a01333be62..c4c5ed8e08 100644 --- a/examples/painting/concentriccircles/window.cpp +++ b/examples/painting/concentriccircles/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "circlewidget.h" #include "window.h" diff --git a/examples/painting/deform/deform.pro b/examples/painting/deform/deform.pro index 673b2e8288..2bfc5d32cd 100644 --- a/examples/painting/deform/deform.pro +++ b/examples/painting/deform/deform.pro @@ -9,7 +9,7 @@ RESOURCES += deform.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl + QT += opengl widgets } # install diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro index 6d93d913e8..69960cd68e 100644 --- a/examples/painting/fontsampler/fontsampler.pro +++ b/examples/painting/fontsampler/fontsampler.pro @@ -10,4 +10,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp index 96698437b1..21babaf8d2 100644 --- a/examples/painting/fontsampler/mainwindow.cpp +++ b/examples/painting/fontsampler/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" diff --git a/examples/painting/gradients/gradients.h b/examples/painting/gradients/gradients.h index e1a2bcb41e..3277c4b21d 100644 --- a/examples/painting/gradients/gradients.h +++ b/examples/painting/gradients/gradients.h @@ -44,7 +44,7 @@ #include "arthurwidgets.h" -#include <QtGui> +#include <QtWidgets> class HoverPoints; diff --git a/examples/painting/gradients/gradients.pro b/examples/painting/gradients/gradients.pro index 22a4baac9e..66f19c0801 100644 --- a/examples/painting/gradients/gradients.pro +++ b/examples/painting/gradients/gradients.pro @@ -8,7 +8,7 @@ include($$SHARED_FOLDER/shared.pri) RESOURCES += gradients.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl + QT += opengl widgets } # install diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp index 9488204e30..e0173ff6d6 100644 --- a/examples/painting/imagecomposition/imagecomposer.cpp +++ b/examples/painting/imagecomposition/imagecomposer.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "imagecomposer.h" diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro index c1bc7d4454..e8841ea770 100644 --- a/examples/painting/imagecomposition/imagecomposition.pro +++ b/examples/painting/imagecomposition/imagecomposition.pro @@ -13,5 +13,6 @@ symbian { TARGET.UID3 = 0xA000A64B CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro index b4233ccafc..6ead35fe5a 100644 --- a/examples/painting/painterpaths/painterpaths.pro +++ b/examples/painting/painterpaths/painterpaths.pro @@ -15,5 +15,6 @@ symbian { TARGET.UID3 = 0xA000A64C CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/painting/painterpaths/renderarea.cpp b/examples/painting/painterpaths/renderarea.cpp index 977fe30ed0..9bff70bb41 100644 --- a/examples/painting/painterpaths/renderarea.cpp +++ b/examples/painting/painterpaths/renderarea.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "renderarea.h" diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp index 0a4c1b0ca3..1139ad0258 100644 --- a/examples/painting/painterpaths/window.cpp +++ b/examples/painting/painterpaths/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <math.h> diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro index 33d9e354ba..263cc7326b 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -19,6 +19,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets maemo5: CONFIG += qt_example examples_affine.subdir = affine diff --git a/examples/painting/pathstroke/pathstroke.h b/examples/painting/pathstroke/pathstroke.h index f0360b6648..72b897a994 100644 --- a/examples/painting/pathstroke/pathstroke.h +++ b/examples/painting/pathstroke/pathstroke.h @@ -43,7 +43,7 @@ #define PATHSTROKE_H #include "arthurwidgets.h" -#include <QtGui> +#include <QtWidgets> class PathStrokeRenderer : public ArthurFrame { diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro index 1d1efdc342..d3f6596390 100644 --- a/examples/painting/pathstroke/pathstroke.pro +++ b/examples/painting/pathstroke/pathstroke.pro @@ -9,7 +9,7 @@ RESOURCES += pathstroke.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl + QT += opengl widgets } # install 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\ diff --git a/examples/painting/transformations/renderarea.cpp b/examples/painting/transformations/renderarea.cpp index 568cfde287..04a6eb511f 100644 --- a/examples/painting/transformations/renderarea.cpp +++ b/examples/painting/transformations/renderarea.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "renderarea.h" diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro index d9b0215c66..2e76a13c5f 100644 --- a/examples/painting/transformations/transformations.pro +++ b/examples/painting/transformations/transformations.pro @@ -14,6 +14,7 @@ symbian { TARGET.UID3 = 0xA000A64D CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example symbian: warning(This example might not fully work on Symbian platform) diff --git a/examples/painting/transformations/window.cpp b/examples/painting/transformations/window.cpp index fc3bcb856d..24d0a6f5ce 100644 --- a/examples/painting/transformations/window.cpp +++ b/examples/painting/transformations/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "window.h" |