Changeset 8260 in ntrip for trunk/BNC/src/src.pri

Timestamp:

Jan 18, 2018, 11:34:35 AM (6 years ago)

Author:

stuerze

Message:

see #105: adaptations to allow for QtWebkit or QtWebEngine according to it's availability

File:

• trunk/BNC/src/src.pri (modified) (2 diffs)

trunk/BNC/src/src.pri

@@ -135 +135 @@
 # Check QtWebKit Library Existence
 # --------------------------------
-win32 {
-  exists("$$[QT_INSTALL_BINS]/QtWebKit4.dll") {
+exists("$$[QT_INSTALL_LIBS]/*WebKit*") {
     DEFINES += QT_WEBKIT
-  }
+    QT      += webkitwidgets
+    message("Configured with QtWebKit")
 }
 
-unix {
-  exists("$$[QT_INSTALL_LIBS]/libQtWebKit.so") {
-    DEFINES += QT_WEBKIT
-  }
+exists("$$[QT_INSTALL_LIBS]/*WebEngineWidgets*") {
+    DEFINES += QT_WEBENGINE
+    QT      += webenginewidgets
+    message("Configured with QtWebEngine")
 }
 
-macx {
-  exists("$$[QT_INSTALL_LIBS]/QtWebKit.framework") {
-    DEFINES += QT_WEBKIT
-  }
-}
-
-contains(DEFINES, QT_WEBKIT) {
-  message("Configured with QtWebKit")
-  QT          += webkit
+contains(DEFINES, QT_WEBENGINE) | contains(DEFINES, QT_WEBKIT) {
   HEADERS     += map/bncmapwin.h
   SOURCES     += map/bncmapwin.cpp
@@ -161 +153 @@
 }
 else {
-  message("No QtWebKit")
+  message("Neither QtWebEngine nor QtWebKit is available")
 }