Changeset 5184 in ntrip for trunk

Timestamp:

Jun 9, 2013, 9:23:47 AM (11 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/src.pri

@@ -6 +6 @@
 RESOURCES += bnc.qrc
 
-QT += svg webkit
+QT += svg
 
 unix:QMAKE_CFLAGS_RELEASE   -= -O2
@@ -59 +59 @@
           RTCM3/clock_and_orbit/clock_orbit_rtcm.h                    \
           RTCM3/ephemeris.h RTCM3/timeutils.h                         \
-          GPSS/gpssDecoder.h GPSS/hassDecoder.h                       \
-          map/bncmapwin.h
+          GPSS/gpssDecoder.h GPSS/hassDecoder.h                       
 
 HEADERS       += serial/qextserialbase.h serial/qextserialport.h
@@ -89 +88 @@
           RTCM3/clock_and_orbit/clock_orbit_rtcm.c                    \
           RTCM3/ephemeris.cpp RTCM3/timeutils.cpp                     \
-          GPSS/gpssDecoder.cpp GPSS/hassDecoder.cpp                   \
-          map/bncmapwin.cpp
+          GPSS/gpssDecoder.cpp GPSS/hassDecoder.cpp                   
 
 SOURCES       += serial/qextserialbase.cpp serial/qextserialport.cpp
@@ -134 +132 @@
 }  
 
-OTHER_FILES += map/html/index.html map/html/mapview.js
+contains(DEFINES, QT_WEBKIT) {
+  message("Configured with QtWebKit")
+  HEADERS += map/bncmapwin.h
+  SOURCES += map/bncmapwin.cpp
+  OTHER_FILES += map/html/index.html map/html/mapview.js
+}
+else {
+  message("No QtWebKit")
+}
+