Merge pull request #941 from openscad/qscintilla-fedora20-fix

Use fallback if CONFIG+=qscintilla2 does not add a lib reference
2014-09-05 14:42:06 -04:00 · 2014-09-05 14:42:06 -04:00 · 5252bae1f9
parent 155c275180 d08e7bbe82
commit 5252bae1f9
1 changed files with 7 additions and 0 deletions
--- a/scintilla.pri
+++ b/scintilla.pri
@ -8,4 +8,11 @@ scintilla {
  # debug builds, so we supply our own
  win32|macx: include(qscintilla2.prf)
  else: CONFIG += qscintilla2
+
+  # Older scintilla libs (e.g. 2.7.2 on fedora20) do not provide the
+  # prf file, so if no lib added at this point, we still fall back to
+  # the included qscintilla2.prf
+  !contains(LIBS, ".*scintilla.*") {
+    include(qscintilla2.prf)
+  }
 }