I've attached a patch very similar to how other libraries support parallel-
installability betweeen qt4 and qt5 (and newer) versions. In short, it adds
a -qt5 postfix to conflicting pieces (the base shared library name, namely).
This breaks ABI obviously (unavoidable), but API interfaces are unaffected.
I've tested that this allows me to build/run both eric6 (python3/qt5 based)
and eric4 (python2/qt4 based) at the same time.
-- Rex
diff -up QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf
--- QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf.qt5 2014-09-11 12:15:15.000000000 -0500
+++ QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf 2014-12-28 21:55:24.721885699 -0600
@@ -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.8.4/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro
--- QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro.qt5 2014-09-11 12:15:15.000000000 -0500
+++ QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro 2014-12-28 21:13:49.164135542 -0600
@@ -28,7 +28,11 @@
!win32:VERSION = 11.3.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
