Phil Thompson wrote:
> QScintilla v2.9 has been released. It is based on Scintilla v3.5.4 and
> no longer supports Qt v3 and PyQt v3. For full details see the NEWS
> file.
Here's my "make qscintilla qt4 and qt5 parallel-installable" patch rebased
for 2.9 attached, for distros interested in being able to ship both.
-- Rex
diff -up QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf
--- QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5 2015-04-20 09:38:24.000000000 -0500
+++ QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf 2015-04-20 18:39:10.215614625 -0500
@@ -17,9 +17,17 @@ CONFIG(debug, debug|release) {
win32: {
LIBS += -lqscintilla2d
} else {
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
+ } else {
LIBS += -lqscintilla2
}
+ }
}
} else {
+greaterThan(QT_MAJOR_VERSION, 4) {
+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
+} else {
LIBS += -lqscintilla2
}
+}
diff -up QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro
--- QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5 2015-04-20 18:39:10.215614625 -0500
+++ QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro 2015-04-20 18:40:39.228015798 -0500
@@ -23,7 +23,11 @@
!win32:VERSION = 12.0.0
TEMPLATE = lib
+greaterThan(QT_MAJOR_VERSION, 4) {
+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
+} else {
TARGET = qscintilla2
+}
CONFIG += qt warn_off release thread exceptions
INCLUDEPATH += . ../include ../lexlib ../src
_______________________________________________
QScintilla mailing list
[email protected]
http://www.riverbankcomputing.com/mailman/listinfo/qscintilla
