From cc4b633e436ce028b911345b987e48ba5e96fae8 Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Sun, 26 Apr 2015 16:45:04 +0200 Subject: [PATCH] Workaround for Fedora 21 builds (fixes #1254). Fedora installs qscintilla2.prf in the wrong location and has a different naming scheme than the one used in Ubuntu so the existing workaround fails. This adds yet another workaround to detect the different naming for the Qt5 version of the QScintilla2 library. --- qscintilla2.prf | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/qscintilla2.prf b/qscintilla2.prf index 5daa57e0..0326430d 100644 --- a/qscintilla2.prf +++ b/qscintilla2.prf @@ -10,6 +10,16 @@ INCLUDEPATH += $$[QT_INSTALL_HEADERS] LIBS += -L$$[QT_INSTALL_LIBS] +QT5LIB=qt5scintilla2 + +unix:linux* { + FEDORA32LIBS=/usr/lib/libqscintilla2-qt5.so + FEDORA64LIBS=/usr/lib64/libqscintilla2-qt5.so + exists($$FEDORA32LIBS) | exists($$FEDORA64LIBS) { + QT5LIB=qscintilla2-qt5 + } +} + CONFIG(debug, debug|release) { mac: { #LIBS += -lqscintilla2_debug @@ -19,7 +29,8 @@ CONFIG(debug, debug|release) { LIBS += -lqscintilla2d } else { greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lqt5scintilla2 + message("Using $$QT5LIB as library name") + LIBS += -l$$QT5LIB } else { LIBS += -lqscintilla2 } @@ -33,7 +44,8 @@ CONFIG(debug, debug|release) { LIBS += -lqscintilla2 } else { greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lqt5scintilla2 + message("Using $$QT5LIB as library name") + LIBS += -l$$QT5LIB } else { LIBS += -lqscintilla2 }