Blob Blame History Raw
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-26 12:54:53.478359373 -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 09:38:24.000000000 -0500
+++ QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro	2015-04-26 13:07:36.261581948 -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