effectively revert 658697932172536537e6a22e883d78572f7e96bf

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index df6fd24..466a451 100644 (file)
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -61,9 +61,9 @@ QPixmap qt_pixmapForBrush(int brushStyle)
     return QBitmap::fromData(QSize(8, 8), qt_patternForBrush(brushStyle), QImage::Format_MonoLSB);
 }
 
-Q_GUI_EXPORT QImage qt_diagCrossBrush()
+Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle)
 {
-    return QImage(qt_patternForBrush(Qt::DiagCrossPattern), 8, 8, 1, QImage::Format_MonoLSB);
+    return QImage(qt_patternForBrush(brushStyle), 8, 8, 1, QImage::Format_MonoLSB);
 }
 
 

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 3a1817e..7c32e3b 100644 (file)
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3197,7 +3197,7 @@ void QSpanData::init(QRasterBuffer *rb, const QRasterPaintEngine *pe)
     clip = pe ? pe->d_func()->clip() : 0;
 }
 
-Q_GUI_EXPORT extern QImage qt_diagCrossBrush();
+Q_GUI_EXPORT extern QImage qt_imageForBrush(int brushStyle);
 
 void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode compositionMode)
 {
@@ -3286,7 +3286,7 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode
         type = Texture;
         if (!tempImage)
             tempImage = new QImage();
-        *tempImage = rasterBuffer->colorizeBitmap(qt_diagCrossBrush(), brush.color());
+        *tempImage = rasterBuffer->colorizeBitmap(qt_imageForBrush(brushStyle), brush.color());
         initTexture(tempImage, alpha, QTextureData::Tiled);
         break;
     case Qt::TexturePattern: