Salome HOME
SALOME 6.5.0 preparation: add patch for OCCT 6.5.3
[tools/install.git] / config_files / patches / QScintilla-2.6.1.patch
1 diff -Naur --exclude=CVS QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp
2 --- QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp 2012-02-10 13:59:50.000000000 +0400
3 +++ QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp      2012-04-04 17:44:23.000000000 +0400
4 @@ -245,9 +245,7 @@
5  void QsciListBoxQt::RegisterRGBAImage(int type, int, int,
6          const unsigned char *pixelsImage)
7  {
8 -    QPixmap pm;
9 -
10 -    pm.convertFromImage(*reinterpret_cast<const QImage *>(pixelsImage));
11 +    QPixmap pm = QPixmap::fromImage(*reinterpret_cast<const QImage *>(pixelsImage));
12      xset.insert(type, pm);
13  }
14