diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,14 +60,14 @@
    find_package(Qt5Location REQUIRED)
    find_package(Qt5Positioning REQUIRED)
    find_package(Qt5Multimedia REQUIRED)
-   set ( MARBLE_NO_WEBKIT TRUE )
+   set ( MARBLE_NO_WEBKITWIDGETS TRUE )
 else()
    find_package(Qt5WebKit)
    find_package(Qt5WebKitWidgets)
    find_package(Qt5DBus REQUIRED)
 
-   if ( NOT Qt5WebKit_FOUND )
-     set ( MARBLE_NO_WEBKIT TRUE )
+   if ( NOT Qt5WebKitWidgets_FOUND )
+     set ( MARBLE_NO_WEBKITWIDGETS TRUE )
    endif()
 endif()
 
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -43,8 +43,8 @@
 # link_directories (${QT_LIBRARY_DIR})
 ########### next target ###############
 
-if(MARBLE_NO_WEBKIT)
-add_definitions(-DMARBLE_NO_WEBKIT)
+if(MARBLE_NO_WEBKITWIDGETS)
+add_definitions(-DMARBLE_NO_WEBKITWIDGETS)
 endif()
 
 set(marblewidget_SRCS
@@ -282,7 +282,7 @@
 )
 
 
-if (MARBLE_NO_WEBKIT)
+if (MARBLE_NO_WEBKITWIDGETS)
     LIST(APPEND marblewidget_SRCS
         NullMarbleWebView.cpp
         NullTinyWebBrowser.cpp
@@ -341,7 +341,7 @@
     FormattedTextWidget.ui
     ElevationWidget.ui
 )
-if (MARBLE_NO_WEBKIT)
+if (MARBLE_NO_WEBKITWIDGETS)
     LIST(APPEND marblewidget_UI
         NullLegendWidget.ui
         NullWebPopupWidget.ui
@@ -420,7 +420,7 @@
 
 ########### install files ###############
 
-if (MARBLE_NO_WEBKIT)
+if (MARBLE_NO_WEBKITWIDGETS)
     set(marble_WebKit
         NullMarbleWebView.h
         NullTinyWebBrowser.h
diff --git a/src/lib/marble/LegendWidget.cpp b/src/lib/marble/LegendWidget.cpp
--- a/src/lib/marble/LegendWidget.cpp
+++ b/src/lib/marble/LegendWidget.cpp
@@ -16,7 +16,7 @@
 
 using namespace Marble;
 // Ui
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
 #include "ui_NullLegendWidget.h"
 #else
 #include "ui_LegendWidget.h"
diff --git a/src/lib/marble/MarbleLegendBrowser.h b/src/lib/marble/MarbleLegendBrowser.h
--- a/src/lib/marble/MarbleLegendBrowser.h
+++ b/src/lib/marble/MarbleLegendBrowser.h
@@ -20,7 +20,7 @@
 
 #include <QString>
 
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
 #include "NullMarbleWebView.h"
 #else
 #include "MarbleWebView.h"
diff --git a/src/lib/marble/MarbleLegendBrowser.cpp b/src/lib/marble/MarbleLegendBrowser.cpp
--- a/src/lib/marble/MarbleLegendBrowser.cpp
+++ b/src/lib/marble/MarbleLegendBrowser.cpp
@@ -28,7 +28,7 @@
 #include <QStyleOptionButton>
 #include <QRegExp>
 
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
 #include <QWebFrame>
 #include <QWebElement>
 #endif
@@ -76,7 +76,7 @@
     d->m_suppressSelection = false;
 #endif // Q_WS_MAEMO_5
 
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     QWebFrame *frame = page()->mainFrame();
     connect(frame, SIGNAL(javaScriptWindowObjectCleared()),
             this, SLOT(injectCheckBoxChecker()));
@@ -137,7 +137,7 @@
         return;
     }
 
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     if (d->m_currentThemeId != d->m_marbleModel->mapThemeId()) {
         d->m_currentThemeId = d->m_marbleModel->mapThemeId();
     } else {
@@ -186,7 +186,7 @@
 
 void MarbleLegendBrowser::injectCheckBoxChecker()
 {
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     QWebFrame *frame = page()->mainFrame();
     frame->addToJavaScriptWindowObject( "Marble", this );
 #endif
@@ -385,7 +385,7 @@
 
 void MarbleLegendBrowser::setCheckedProperty( const QString& name, bool checked )
 {
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     QWebElement box = page()->mainFrame()->findFirstElement("input[name="+name+']');
     if (!box.isNull()) {
         if (checked != d->m_checkBoxMap[name]) {
@@ -400,7 +400,7 @@
 
 void MarbleLegendBrowser::setRadioCheckedProperty( const QString& value, const QString& name , bool checked )
 {
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     QWebElement box = page()->mainFrame()->findFirstElement("input[value="+value+']');
     QWebElementCollection boxes = page()->mainFrame()->findAllElements("input[name="+name+']');
     QString currentValue="";
diff --git a/src/lib/marble/PopupItem.h b/src/lib/marble/PopupItem.h
--- a/src/lib/marble/PopupItem.h
+++ b/src/lib/marble/PopupItem.h
@@ -19,7 +19,7 @@
 
 #include "BillboardGraphicsItem.h"
 
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
 #include "ui_NullWebPopupWidget.h"
 #else
 #include "ui_WebPopupWidget.h"
diff --git a/src/lib/marble/PopupItem.cpp b/src/lib/marble/PopupItem.cpp
--- a/src/lib/marble/PopupItem.cpp
+++ b/src/lib/marble/PopupItem.cpp
@@ -14,7 +14,7 @@
 #include "PopupItem.h"
 #include "MarbleWidget.h"
 
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
 #include "NullMarbleWebView.h"
 #else
 #include <QWebView>
@@ -68,7 +68,7 @@
     QPalette palette = m_ui.webView->palette();
     palette.setBrush(QPalette::Base, Qt::transparent);
     m_ui.webView->setPalette(palette);
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     m_ui.webView->page()->setPalette(palette);
 #endif
     m_ui.webView->setAttribute(Qt::WA_OpaquePaintEvent, false);
@@ -78,7 +78,7 @@
     connect( m_ui.webView, SIGNAL(urlChanged(QUrl)), this, SLOT(updateBackButton()) );
     connect( m_ui.hideButton, SIGNAL(clicked()), this, SIGNAL(hide()) );
 
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     // Update the popupitem on changes while loading the webpage
     connect( m_ui.webView->page(), SIGNAL(repaintRequested(QRect)), this, SLOT(requestUpdate()) );
 #endif
@@ -107,7 +107,7 @@
     QPalette palette = m_ui.webView->palette();
     palette.setBrush(QPalette::Base, Qt::transparent);
     m_ui.webView->setPalette(palette);
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     m_ui.webView->page()->setPalette(palette);
 #endif
     m_ui.webView->setAttribute(Qt::WA_OpaquePaintEvent, false);
@@ -119,7 +119,7 @@
 {
     m_content = html;
     m_baseUrl = baseUrl;
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     m_ui.webView->setHtml( html, baseUrl );
 #endif
 
@@ -344,7 +344,7 @@
 {
     m_content.clear();
     m_ui.webView->setUrl( QUrl( "about:blank" ) );
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     m_ui.webView->history()->clear();
 #endif
 }
@@ -358,7 +358,7 @@
 void PopupItem::printContent() const
 {
 #ifndef QT_NO_PRINTER
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     QPrinter printer;
     QPointer<QPrintDialog> dialog = new QPrintDialog(&printer);
     if (dialog->exec() == QPrintDialog::Accepted) {
@@ -371,7 +371,7 @@
 
 void PopupItem::updateBackButton()
 {
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     bool const hasHistory = m_ui.webView->history()->count() > 1;
     bool const previousIsHtml = !m_content.isEmpty() && m_ui.webView->history()->currentItemIndex() == 1;
     bool const atStart = m_ui.webView->history()->currentItemIndex() <= 1;
@@ -382,7 +382,7 @@
 
 void PopupItem::goBack()
 {
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
     if ( m_ui.webView->history()->currentItemIndex() == 1 && !m_content.isEmpty() ) {
         m_ui.webView->setHtml( m_content, m_baseUrl );
     } else {
diff --git a/src/lib/marble/cloudsync/RouteItemDelegate.cpp b/src/lib/marble/cloudsync/RouteItemDelegate.cpp
--- a/src/lib/marble/cloudsync/RouteItemDelegate.cpp
+++ b/src/lib/marble/cloudsync/RouteItemDelegate.cpp
@@ -2,7 +2,7 @@
 
 #include <QPainter>
 
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
 #include <QWidget>
 #else
 #include <QWebView>
diff --git a/src/lib/marble/routing/RoutingInputWidget.cpp b/src/lib/marble/routing/RoutingInputWidget.cpp
--- a/src/lib/marble/routing/RoutingInputWidget.cpp
+++ b/src/lib/marble/routing/RoutingInputWidget.cpp
@@ -15,7 +15,7 @@
 #include "MarblePlacemarkModel.h"
 #include "RouteRequest.h"
 
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
 #include "NullTinyWebBrowser.h"
 #else
 #include "TinyWebBrowser.h"
diff --git a/src/plugins/render/CMakeLists.txt b/src/plugins/render/CMakeLists.txt
--- a/src/plugins/render/CMakeLists.txt
+++ b/src/plugins/render/CMakeLists.txt
@@ -32,16 +32,16 @@
 # Disabled for now until legal issues wrt to the API
 # and terms of service of opencaching are cleared up.
 #add_subdirectory( opencaching )
-if(NOT MARBLE_NO_WEBKIT)
+if(NOT MARBLE_NO_WEBKITWIDGETS)
 add_subdirectory( opencachingcom )
 add_subdirectory( opendesktop )
 add_subdirectory( photo )
 endif()
 # add_subdirectory( panoramio )
 add_subdirectory( postalcode )
 add_subdirectory( satellites )
 # add_subdirectory ( twitter )
-if(NOT MARBLE_NO_WEBKIT)
+if(NOT MARBLE_NO_WEBKITWIDGETS)
 add_subdirectory( wikipedia )
 add_subdirectory( weather )
 endif()