From 146bbbafeddef8d770af3f91d69c9ff420e39229 Mon Sep 17 00:00:00 2001 From: Deiz Date: Fri, 8 May 2015 15:37:52 -0400 Subject: [PATCH] Respect WITH_WEBKIT when defining HAVE_WEBKIT --- CMakeLists.txt | 6 +++++- src/qtui/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8739738..a1f79a08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,7 +240,11 @@ if (USE_QT5) ) endif() endif() - add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat") + + if (WITH_WEBKIT AND Qt5WebKitWidgets_FOUND) + set(HAVE_WEBKIT true) + endif() + add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" HAVE_WEBKIT "Support showing previews for URLs in chat") # KDE Frameworks ################ diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt index be9a14b5..13279baa 100644 --- a/src/qtui/CMakeLists.txt +++ b/src/qtui/CMakeLists.txt @@ -130,7 +130,7 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND) qt_add_dbus_adaptor (SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus) endif() -if (QT_QTWEBKIT_FOUND OR Qt5WebKitWidgets_FOUND) +if (HAVE_WEBKIT) add_definitions(-DHAVE_WEBKIT) list(APPEND QT_MODULES WebKit) if (USE_QT5) -- 2.20.1