[Python-modules-commits] [qscintilla2] 08/14: qt5_libname

[Scott Kitterman]

This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch master
in repository qscintilla2.

commit 22a91ae4a0cb9760ac300a1294cbcfce8f1c11fc
Author: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
Date:   Thu Oct 8 13:39:20 2015 -0700

    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.
    Patch-Name: qt5_libname.patch
---
 Qt4Qt5/features/qscintilla2.prf | 11 ++++++++++-
 Qt4Qt5/qscintilla.pro           |  1 +
 designer-Qt4Qt5/designer.pro    |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Qt4Qt5/features/qscintilla2.prf b/Qt4Qt5/features/qscintilla2.prf
index 1b12cdf..5be1ed2 100644
--- a/Qt4Qt5/features/qscintilla2.prf
+++ b/Qt4Qt5/features/qscintilla2.prf
@@ -19,9 +19,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 6390edb..0958fbe 100644
--- a/Qt4Qt5/qscintilla.pro
+++ b/Qt4Qt5/qscintilla.pro
@@ -34,6 +34,7 @@ DEFINES += SCINTILLA_QT SCI_LEXER
 
 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 bd4b084..18339ee 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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git