get rid of QPicture

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

CMakeLists.txt

@@ -35,7 +35,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "4")
 set(CPACK_PACKAGE_VERSION_MINOR "9")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_SET_DESTDIR TRUE)
-set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git;${CPACK_SOURCE_IGNORE_FILES}")
+set(CPACK_SOURCE_IGNORE_FILES "/build/;/minsize/;/.git;${CPACK_SOURCE_IGNORE_FILES}")
 set(CPACK_STRIP_FILES TRUE)
 set(CPACK_GENERATOR "TXZ")
 set(CPACK_SOURCE_GENERATOR "TXZ")

README

@@ -27,7 +27,7 @@ There are several things you should be aware before considering Katie:
   - OpenVG is no longer supported graphics output
   - Blitter is no longer supported painting engine
   - native graphics system is no more, rasterizer is just as fast as native
-  - QPictureIO and plugins for it are no longer supported
+  - QPicture, QPictureIO and plugins for it are no longer supported
   - QML debugger and inspector have been removed, potentially dangerous
   - no SIMD, zero performance impact with decent compiler
   - state machine is no more

src/core/global/qconfig.h.cmake

@@ -49,6 +49,7 @@
 #define QT_NO_DIRECTPAINTER
 #define QT_NO_COP
 #define QT_NO_BLITTABLE
+#define QT_NO_PICTURE
 #define QT_NO_PICTUREIO
 #define QT_NO_SOFTKEYMANAGER
 #define QT_NO_SXE
@@ -225,7 +226,6 @@
 #cmakedefine QT_NO_NSL
 #cmakedefine QT_NO_PAINT_DEBUG
 #cmakedefine QT_NO_PDF
-#cmakedefine QT_NO_PICTURE
 #cmakedefine QT_NO_PLUGIN_CHECK
 #cmakedefine QT_NO_PRINTDIALOG
 #cmakedefine QT_NO_PRINTER
@@ -530,7 +530,7 @@
 #endif
 
 // QPrinter
-#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE))
+#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_TEMPORARYFILE))
 #define QT_NO_PRINTER
 #endif
 

src/core/global/qnamespace.h

@@ -1464,17 +1464,16 @@ typedef bool (*qInternalCallback)(void **);
 class Q_CORE_EXPORT QInternal {
 public:
     enum PaintDeviceFlags {
-        UnknownDevice = 0x00,
-        Widget        = 0x01,
-        Pixmap        = 0x02,
-        Image         = 0x03,
-        Printer       = 0x04,
-        Picture       = 0x05,
-        Pbuffer       = 0x06,    // GL pbuffer
-        FramebufferObject = 0x07, // GL framebuffer object
-        CustomRaster  = 0x08,
-        PaintBuffer   = 0x09,
-        OpenGL        = 0x0a
+        UnknownDevice     = 0,
+        Widget            = 1,
+        Pixmap            = 2,
+        Image             = 3,
+        Printer           = 4,
+        Pbuffer           = 5,    // GL pbuffer
+        FramebufferObject = 6, // GL framebuffer object
+        CustomRaster      = 7,
+        PaintBuffer       = 8,
+        OpenGL            = 9
     };
     enum RelayoutType {
         RelayoutNormal,

src/gui/CMakeLists.txt

@@ -169,7 +169,6 @@ set(GUI_PUBLIC_HEADERS
     QPalette
     QPanGesture
     QPen
-    QPicture
     QPixmap
     QPixmapCache
     QPlainTextDocumentLayout

src/gui/graphicsview/qgraphicsitem.cpp

@@ -5140,11 +5140,11 @@ QRegion QGraphicsItem::boundingRegion(const QTransform &itemToDeviceTransform) c
     // ### Ideally we would have a better way to generate this region,
     // preferably something in the lines of QPainterPath::toRegion(QTransform)
     // coupled with a way to generate a painter path from a set of painter
-    // operations (e.g., QPicture::toPainterPath() or so). The current
-    // approach generates a bitmap with the size of the item's bounding rect
-    // in device coordinates, scaled by b.r.granularity, then paints the item
-    // into the bitmap, converts the result to a QRegion and scales the region
-    // back to device space with inverse granularity.
+    // operations. The current approach generates a bitmap with the size of
+    // the item's bounding rect in device coordinates, scaled by
+    // b.r.granularity, then paints the item into the bitmap, converts the
+    // result to a QRegion and scales the region back to device space with
+    // inverse granularity.
     qreal granularity = boundingRegionGranularity();
     QRect deviceRect = itemToDeviceTransform.mapRect(boundingRect()).toRect();
     _q_adjustRect(&deviceRect);

src/gui/graphicsview/qgraphicsscene.cpp

@@ -1722,10 +1722,7 @@ void QGraphicsScene::render(QPainter *painter, const QRectF &target, const QRect
     // Default target rect = device rect
     QRectF targetRect = target;
     if (targetRect.isNull()) {
-        if (painter->device()->devType() == QInternal::Picture)
-            targetRect = sourceRect;
-        else
-            targetRect.setRect(0, 0, painter->device()->width(), painter->device()->height());
+        targetRect.setRect(0, 0, painter->device()->width(), painter->device()->height());
     }
 
     // Find the ideal x / y scaling ratio to fit \a source into \a target.

src/gui/graphicsview/qgraphicsview.cpp

@@ -2060,10 +2060,7 @@ void QGraphicsView::render(QPainter *painter, const QRectF &target, const QRect
     // Default target rect = device rect
     QRectF targetRect = target;
     if (target.isNull()) {
-        if (painter->device()->devType() == QInternal::Picture)
-            targetRect = sourceRect;
-        else
-            targetRect.setRect(0, 0, painter->device()->width(), painter->device()->height());
+        targetRect.setRect(0, 0, painter->device()->width(), painter->device()->height());
     }
 
     // Find the ideal x / y scaling ratio to fit \a source into \a target.

src/gui/image/image.cmake

@@ -12,9 +12,6 @@ set(GUI_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qimagereader.h
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qimagewriter.h
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qmovie.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/image/qpaintengine_pic_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/image/qpicture.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/image/qpicture_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap.h
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap_raster_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmapcache.h
@@ -38,8 +35,6 @@ set(GUI_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qimageiohandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qimagereader.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qimagewriter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/image/qpaintengine_pic.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/image/qpicture.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmap.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmapcache.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/image/qpixmapdata.cpp

src/gui/image/qimage.cpp

@@ -294,12 +294,10 @@ bool QImageData::checkForAlphaPixels() const
     can be used as a paint device.
 
     Qt provides four classes for handling image data: QImage, QPixmap,
-    QBitmap and QPicture.  QImage is designed and optimized for I/O,
-    and for direct pixel access and manipulation, while QPixmap is
-    designed and optimized for showing images on screen. QBitmap is
-    only a convenience class that inherits QPixmap, ensuring a
-    depth of 1. Finally, the QPicture class is a paint device that
-    records and replays QPainter commands.
+    and QBitmap.  QImage is designed and optimized for I/O, and for
+    direct pixel access and manipulation, while QPixmap is designed
+    and optimized for showing images on screen. QBitmap is only a
+    convenience class that inherits QPixmap, ensuring a depth of 1.
 
     Because QImage is a QPaintDevice subclass, QPainter can be used to
     draw directly onto images.  When using QPainter on a QImage, the