Changeset 8264 in ntrip


Ignore:
Timestamp:
Jan 19, 2018, 1:38:37 PM (6 years ago)
Author:
stuerze
Message:

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

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/map/bncmapwin.h

    r8260 r8264  
    2828#ifdef QT_WEBENGINE
    2929  #include <QWebEngineView>
     30  #include <QWebEnginePage>
    3031#else
    3132  #include <QWebView>
     33  #include <QWebFrame>
    3234#endif
    3335#include <QLabel>
    3436#include <QHBoxLayout>
    35 #include <QWebFrame>
    3637#include <QByteArray>
    3738#include <QDialog>

  • trunk/BNC/src/src.pri

    r8260 r8264  
    137137exists("$$[QT_INSTALL_LIBS]/*WebKit*") {
    138138    DEFINES += QT_WEBKIT
    139     QT      += webkitwidgets
     139    QT      += webkit webkitwidgets
    140140    message("Configured with QtWebKit")
    141141}
Note: See TracChangeset for help on using the changeset viewer.