From e510b6e4661f256a736b1eff42b4b7586acef788 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 7 May 2011 22:57:49 +0200 Subject: include fixes Fixed the include statements added QT+=widgets in examples/network to get them to compile. Will need something better than doing it manually. --- examples/painting/basicdrawing/renderarea.cpp | 2 +- examples/painting/basicdrawing/window.cpp | 2 +- examples/painting/concentriccircles/circlewidget.cpp | 2 +- examples/painting/concentriccircles/window.cpp | 2 +- examples/painting/fontsampler/mainwindow.cpp | 2 +- examples/painting/imagecomposition/imagecomposer.cpp | 2 +- examples/painting/painterpaths/renderarea.cpp | 2 +- examples/painting/painterpaths/window.cpp | 2 +- examples/painting/transformations/renderarea.cpp | 2 +- examples/painting/transformations/window.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples/painting') 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 +#include #include "renderarea.h" diff --git a/examples/painting/basicdrawing/window.cpp b/examples/painting/basicdrawing/window.cpp index 54422a0104..2bb7c63493 100644 --- a/examples/painting/basicdrawing/window.cpp +++ b/examples/painting/basicdrawing/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include +#include #include "renderarea.h" #include "window.h" 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 +#include #include "circlewidget.h" 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 +#include #include "circlewidget.h" #include "window.h" diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp index 0976d1f971..27e8169f61 100644 --- a/examples/painting/fontsampler/mainwindow.cpp +++ b/examples/painting/fontsampler/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include +#include #include "mainwindow.h" diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp index a41f405fd0..6410b30062 100644 --- a/examples/painting/imagecomposition/imagecomposer.cpp +++ b/examples/painting/imagecomposition/imagecomposer.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include +#include #include "imagecomposer.h" 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 +#include #include "renderarea.h" diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp index 429f470b26..2c3c0225c7 100644 --- a/examples/painting/painterpaths/window.cpp +++ b/examples/painting/painterpaths/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include +#include #include 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 +#include #include "renderarea.h" 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 +#include #include "window.h" -- cgit v1.2.3 From a889305c7ebf96a7a1973b8736d4d9430c7bb386 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 7 May 2011 23:50:03 +0200 Subject: fix pro files all examples compile again --- examples/painting/basicdrawing/basicdrawing.pro | 1 + examples/painting/concentriccircles/concentriccircles.pro | 1 + examples/painting/fontsampler/fontsampler.pro | 1 + examples/painting/imagecomposition/imagecomposition.pro | 1 + examples/painting/painterpaths/painterpaths.pro | 1 + examples/painting/painting.pro | 1 + examples/painting/transformations/transformations.pro | 1 + 7 files changed, 7 insertions(+) (limited to 'examples/painting') diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro index e607721ffb..27eb0b3f55 100644 --- a/examples/painting/basicdrawing/basicdrawing.pro +++ b/examples/painting/basicdrawing/basicdrawing.pro @@ -15,3 +15,4 @@ symbian { TARGET.UID3 = 0xA000A649 CONFIG += qt_example } +QT += widgets diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro index f7e050ba21..cc141d0706 100644 --- a/examples/painting/concentriccircles/concentriccircles.pro +++ b/examples/painting/concentriccircles/concentriccircles.pro @@ -14,3 +14,4 @@ symbian { TARGET.UID3 = 0xA000A64A CONFIG += qt_example } +QT += widgets diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro index b9328a6439..a7c8b02853 100644 --- a/examples/painting/fontsampler/fontsampler.pro +++ b/examples/painting/fontsampler/fontsampler.pro @@ -10,3 +10,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro index e8be8fa2b5..dcb8b22f48 100644 --- a/examples/painting/imagecomposition/imagecomposition.pro +++ b/examples/painting/imagecomposition/imagecomposition.pro @@ -13,3 +13,4 @@ symbian { TARGET.UID3 = 0xA000A64B CONFIG += qt_example } +QT += widgets diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro index 84bbecaa83..e8fd7accd6 100644 --- a/examples/painting/painterpaths/painterpaths.pro +++ b/examples/painting/painterpaths/painterpaths.pro @@ -15,3 +15,4 @@ symbian { TARGET.UID3 = 0xA000A64C CONFIG += qt_example } +QT += widgets diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro index 4108a64edd..72ea1c36ae 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro index 8fe8be932e..10515e0df6 100644 --- a/examples/painting/transformations/transformations.pro +++ b/examples/painting/transformations/transformations.pro @@ -14,3 +14,4 @@ symbian { TARGET.UID3 = 0xA000A64D CONFIG += qt_example } +QT += widgets -- cgit v1.2.3 From 310519d6d11da546b23c1cba307f37c24e0a5c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Fri, 15 Jul 2011 14:07:12 +0200 Subject: Rename QPixmapData to QPlatformPixmap. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes the API symmetric with the other Lighthouse APIs. Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893 Reviewed-on: http://codereview.qt.nokia.com/1735 Reviewed-by: Qt Sanity Bot Reviewed-by: Jørgen Lind --- examples/painting/shared/arthurwidgets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/painting') diff --git a/examples/painting/shared/arthurwidgets.cpp b/examples/painting/shared/arthurwidgets.cpp index b3c75f0fc4..2b8d6ebcee 100644 --- a/examples/painting/shared/arthurwidgets.cpp +++ b/examples/painting/shared/arthurwidgets.cpp @@ -86,7 +86,7 @@ ArthurFrame::ArthurFrame(QWidget *parent) #ifdef Q_WS_X11 QPixmap xRenderPixmap(1, 1); - m_prefer_image = xRenderPixmap.pixmapData()->classId() == QPixmapData::X11Class && !xRenderPixmap.x11PictureHandle(); + m_prefer_image = xRenderPixmap.handle()->classId() == QPlatformPixmap::X11Class && !xRenderPixmap.x11PictureHandle(); #endif } -- cgit v1.2.3 From e80b6619524a3720efb5fbe4c2307bec25a12ab8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Jul 2011 10:07:13 +0200 Subject: Build fix for examples. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Samuel Rødal Change-Id: I36f5a4088a39673a8e74a4d53ac83a42696af096 Reviewed-on: http://codereview.qt.nokia.com/2095 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- examples/painting/shared/arthurwidgets.cpp | 7 ------- examples/painting/shared/shared.pro | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'examples/painting') 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 #include -#include - 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\ -- cgit v1.2.3 From 78056064cc4e99162d1c4d82db36b5102d524f55 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 17 Aug 2011 11:47:25 +0200 Subject: Build fix after setPreferredPaintEngine was removed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I286529e0e1917ee3c808eba7dad0957dd4d8194f Reviewed-on: http://codereview.qt.nokia.com/3083 Reviewed-by: Qt Sanity Bot Reviewed-by: Samuel Rødal --- examples/painting/composition/main.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'examples/painting') 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); -- cgit v1.2.3 From 5e6605f7b006225f112b92956961974c8c8ad1a9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 25 Aug 2011 15:53:04 +0200 Subject: Fix building of examples. Change-Id: Iebb56c81fd13deaa82d8883e3f1529f1a78ebea8 Reviewed-on: http://codereview.qt.nokia.com/3603 Reviewed-by: Friedemann Kleint --- examples/painting/fontsampler/fontsampler.pro | 2 +- examples/painting/fontsampler/mainwindow.cpp | 3 +++ examples/painting/fontsampler/mainwindow.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'examples/painting') diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro index 69960cd68e..63892a319a 100644 --- a/examples/painting/fontsampler/fontsampler.pro +++ b/examples/painting/fontsampler/fontsampler.pro @@ -10,5 +10,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler INSTALLS += target sources symbian: CONFIG += qt_example -QT += widgets +QT += widgets printsupport maemo5: CONFIG += qt_example diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp index 21babaf8d2..9efd307f88 100644 --- a/examples/painting/fontsampler/mainwindow.cpp +++ b/examples/painting/fontsampler/mainwindow.cpp @@ -39,6 +39,9 @@ ****************************************************************************/ #include +#include +#include +#include #include "mainwindow.h" diff --git a/examples/painting/fontsampler/mainwindow.h b/examples/painting/fontsampler/mainwindow.h index 4021ee7c6c..1b66c3c370 100644 --- a/examples/painting/fontsampler/mainwindow.h +++ b/examples/painting/fontsampler/mainwindow.h @@ -44,6 +44,7 @@ #include "ui_mainwindowbase.h" QT_BEGIN_NAMESPACE +class QPrinter; class QTextEdit; class QTreeWidget; class QTreeWidgetItem; -- cgit v1.2.3