Blame QScintilla-gpl-2.9-qt5.patch
|
Rex Dieter |
e5c5b64 |
diff -up QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf
|
|
Rex Dieter |
e5c5b64 |
--- QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5 2015-04-20 09:38:24.000000000 -0500
|
|
Rex Dieter |
588f801 |
+++ QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf 2015-04-26 12:54:53.478359373 -0500
|
|
Rex Dieter |
e76762f |
@@ -17,9 +17,17 @@ CONFIG(debug, debug|release) {
|
|
Rex Dieter |
e76762f |
win32: {
|
|
Rex Dieter |
e76762f |
LIBS += -lqscintilla2d
|
|
Rex Dieter |
e76762f |
} else {
|
|
Rex Dieter |
e76762f |
+ greaterThan(QT_MAJOR_VERSION, 4) {
|
|
Rex Dieter |
e76762f |
+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
|
|
Rex Dieter |
e76762f |
+ } else {
|
|
Rex Dieter |
e76762f |
LIBS += -lqscintilla2
|
|
Rex Dieter |
e76762f |
}
|
|
Rex Dieter |
e76762f |
+ }
|
|
Rex Dieter |
e76762f |
}
|
|
Rex Dieter |
e76762f |
} else {
|
|
Rex Dieter |
e76762f |
+greaterThan(QT_MAJOR_VERSION, 4) {
|
|
Rex Dieter |
e76762f |
+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
|
|
Rex Dieter |
e76762f |
+} else {
|
|
Rex Dieter |
e76762f |
LIBS += -lqscintilla2
|
|
Rex Dieter |
e76762f |
}
|
|
Rex Dieter |
e76762f |
+}
|
|
Rex Dieter |
e5c5b64 |
diff -up QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro
|
|
Rex Dieter |
588f801 |
--- QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5 2015-04-20 09:38:24.000000000 -0500
|
|
Rex Dieter |
588f801 |
+++ QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro 2015-04-26 13:07:36.261581948 -0500
|
|
Rex Dieter |
e5c5b64 |
@@ -23,7 +23,11 @@
|
|
Rex Dieter |
e5c5b64 |
!win32:VERSION = 12.0.0
|
|
Rex Dieter |
e76762f |
|
|
Rex Dieter |
e76762f |
TEMPLATE = lib
|
|
Rex Dieter |
e76762f |
+greaterThan(QT_MAJOR_VERSION, 4) {
|
|
Rex Dieter |
e76762f |
+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
|
|
Rex Dieter |
e76762f |
+} else {
|
|
Rex Dieter |
e76762f |
TARGET = qscintilla2
|
|
Rex Dieter |
e76762f |
+}
|
|
Rex Dieter |
e76762f |
CONFIG += qt warn_off release thread exceptions
|
|
Rex Dieter |
e76762f |
INCLUDEPATH += . ../include ../lexlib ../src
|
|
Rex Dieter |
e76762f |
|