jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Workaround for Fedora 21 builds (fixes #1254).

Browse source 
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.
This commit is contained in:
Torsten Paul 2015-04-26 16:45:04 +02:00 committed by Marius Kintel
parent a1b5d3ec0b
commit 41f6b85c4a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qscintilla2.prf
View file

@ -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
}