From: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Date: Mon, 22 Sep 2014 02:09:22 +0000 (+0100)
Subject: qt5_libname
X-Git-Tag: archive/raspbian/2.10.4+dfsg-2+rpi1~1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=697100111d3add32c08c560cb74a7a7bfdab62bb;p=qscintilla2.git

qt5_libname

Rename library when built with Qt5 for co-installability.  Discussed with
upstream, but not reviewed as they aren't particularly interested in it.

Gbp-Pq: Name qt5_libname.patch
---

diff --git a/Qt4Qt5/features/qscintilla2.prf b/Qt4Qt5/features/qscintilla2.prf
index e91e3be..3777cc9 100644
--- a/Qt4Qt5/features/qscintilla2.prf
+++ b/Qt4Qt5/features/qscintilla2.prf
@@ -17,9 +17,18 @@ CONFIG(debug, debug|release) {
         win32: {
             LIBS += -lqscintilla2d
         } else {
-            LIBS += -lqscintilla2
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                LIBS += -lqt5scintilla2
+            } else {
+                LIBS += -lqscintilla2
+            }
         }
     }
 } else {
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        LIBS += -lqt5scintilla2
+        }
+        else {
     LIBS += -lqscintilla2
+        }
 }
diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
index c472988..854d0a0 100644
--- a/Qt4Qt5/qscintilla.pro
+++ b/Qt4Qt5/qscintilla.pro
@@ -41,6 +41,7 @@ greaterThan(QT_MAJOR_VERSION, 3) {
 
 greaterThan(QT_MAJOR_VERSION, 4) {
 	QT += widgets printsupport
+	TARGET = qt5scintilla2
 
     greaterThan(QT_MINOR_VERSION, 1) {
 	    macx:QT += macextras
diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
index e3432ff..4f4d490 100644
--- a/designer-Qt4Qt5/designer.pro
+++ b/designer-Qt4Qt5/designer.pro
@@ -11,8 +11,11 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 
     # Work around QTBUG-39300.
     CONFIG -= android_install
+    TARGET = qt5scintillaplugin
+    LIBS += -lqt5scintilla2
 } else {
     CONFIG += designer
+    LIBS += -lqscintilla2
 }
 
 macx {