SALOME 6.5.0 preparation: update QScintilla script for version 2.6.1 (currect version...

diff --git a/config_files/patches/QScintilla-2.6.1.patch b/config_files/patches/QScintilla-2.6.1.patch
new file mode 100644 (file)
index 0000000..1465a49
--- /dev/null
+++ b/config_files/patches/QScintilla-2.6.1.patch
@@ -0,0 +1,14 @@
+diff -Naur --exclude=CVS QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp
+--- QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp        2012-02-10 13:59:50.000000000 +0400
++++ QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp     2012-04-04 17:44:23.000000000 +0400
+@@ -245,9 +245,7 @@
+ void QsciListBoxQt::RegisterRGBAImage(int type, int, int,
+         const unsigned char *pixelsImage)
+ {
+-    QPixmap pm;
+-
+-    pm.convertFromImage(*reinterpret_cast<const QImage *>(pixelsImage));
++    QPixmap pm = QPixmap::fromImage(*reinterpret_cast<const QImage *>(pixelsImage));
+     xset.insert(type, pm);
+ }
+ 

diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index a30311db24f60fe95fd6c42dddffa9af25c991ca..b118e5f6f08f8b779add02c83b8efb785a3a6adf 100755 (executable)
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.sh
@@ -64,6 +64,9 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
+# apply patch (if there's any)
+( test -f patches/${PRODUCT}.patch && cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < ${PRODUCT}.patch )
+
 # to generate environment scripts
 try_preinstalled
 }