From de3d4ca932b7b60ee5114c1a62eaea516bb2e590 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Tue, 11 Apr 2017 18:52:02 +0200
Subject: [PATCH] adopted for the case where both QtWebKit and QtWebEngine is
 installed.

---
 src/musredit_qt5/musredit/musredit.pro | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/musredit_qt5/musredit/musredit.pro b/src/musredit_qt5/musredit/musredit.pro
index 8e60c6ea..8c6be817 100644
--- a/src/musredit_qt5/musredit/musredit.pro
+++ b/src/musredit_qt5/musredit/musredit.pro
@@ -6,14 +6,16 @@ packagesExist(Qt5WebEngine) {
   DEFINES += HAVE_QT_WEB_ENGINE
   HAVE_QT_WEB_ENGINE = 1
 }
-packagesExist(QtWebKit) {
-  message("QtWebKit found")
-  HAVE_QT_WEB_ENGINE = 0   
-}
-# Mac calls it Qt5WebKit, hence
-packagesExist(Qt5WebKit) {
-  message("Qt5WebKit found")
-  HAVE_QT_WEB_ENGINE = 0   
+isEmpty( HAVE_QT_WEB_ENGINE ) {
+  packagesExist(QtWebKit) {
+    message("QtWebKit found")
+    HAVE_QT_WEB_ENGINE = 0   
+  }
+  # Mac calls it Qt5WebKit, hence
+  packagesExist(Qt5WebKit) {
+    message("Qt5WebKit found")
+    HAVE_QT_WEB_ENGINE = 0   
+  }
 }
 isEmpty(HAVE_QT_WEB_ENGINE) {
   message("Neither Qt(5)WebKit nor Qt5WebEngine found. Something is wrong, please check")
@@ -89,12 +91,12 @@ CONFIG += qt \
 
 QT += widgets
 QT += xml
-isEqual(HAVE_QT_WEB_ENGINE, 1) {
-  QT += webenginewidgets
-}
 isEqual(HAVE_QT_WEB_ENGINE, 0) {
   QT += webkitwidgets
 }
+isEqual(HAVE_QT_WEB_ENGINE, 1) {
+  QT += webenginewidgets
+}
 QT += network
 QT += printsupport
 QT += svg