From 697100111d3add32c08c560cb74a7a7bfdab62bb Mon Sep 17 00:00:00 2001 From: Debian Python Modules Team Date: Mon, 22 Sep 2014 03:09:22 +0100 Subject: [PATCH] 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 --- 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 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 { -- 2.30.2