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 e91e3beb54d5dae9043c6fffec1a73bffa1fb0e7..3777cc94f7eb54c83c9cfde2b9f600c3dd87f8df 100644 (file)
--- 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 c47298812242581b2e467540177806f9e287dd5c..854d0a0f7aa5ce14cb5a3ee38eac53fa065fa5af 100644 (file)
--- 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 e3432ff461513791824874792d96226e1a956aaf..4f4d49087afae398233028e8b97c4f0922f20f60 100644 (file)
--- 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 {