Commit 48b04d4b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Rename variable (prepare the future) it's not experimental here

parent 9c61d252
......@@ -25,7 +25,7 @@ set(CALENDARCORE_VERSION "5.2.40")
set(KMIMELIB_VERSION "5.2.40")
set(AKONADI_VERSION "5.2.40")
option(QTWEBENGINE_EXPERIMENTAL_OPTION "Enable support for qtwebengine. False by default." FALSE)
option(QTWEBENGINE_SUPPORT_OPTION "Enable support for QtWebEngine. False by default." FALSE)
ecm_setup_version(${KDEPIMLIBS_VERSION} VARIABLE_PREFIX AKONADICONTACT
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_version.h"
......@@ -35,7 +35,7 @@ ecm_setup_version(${KDEPIMLIBS_VERSION} VARIABLE_PREFIX AKONADICONTACT
set(QT_REQUIRED_VERSION "5.5.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
if(QTWEBENGINE_EXPERIMENTAL_OPTION)
if(QTWEBENGINE_SUPPORT_OPTION)
set(QT_REQUIRED_MINIMUM_WEBENGINE_VERSION "5.6")
find_package(Qt5 ${QT_REQUIRED_MINIMUM_WEBENGINE_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets)
else()
......
......@@ -86,7 +86,7 @@ set(akonadicontact_editor_generalinfo_SRCS
${akonadicontact_editor_generalinfo_mail_SRCS}
)
if (QTWEBENGINE_EXPERIMENTAL_OPTION)
if (QTWEBENGINE_SUPPORT_OPTION)
set(akonadicontact_addresslocation_web_editor_SRCS
editor/addresseditor/webengine/addresseslocationengineviewer.cpp
editor/addresseditor/webengine/addresseslocationenginepage.cpp
......
#define AKONADI_CONTACT_LIB "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}"
#define AKONADI_CONTACT_PREFIX ""
#cmakedefine QTWEBENGINE_EXPERIMENTAL_OPTION 1
#cmakedefine QTWEBENGINE_SUPPORT_OPTION 1
......@@ -21,7 +21,7 @@
*/
#include "addresseslocationwidget.h"
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
#include "webengine/addresseslocationengineviewer.h"
#else
#include "webkit/addresseslocationviewer.h"
......@@ -36,7 +36,7 @@ AddressesLocationWidget::AddressesLocationWidget(QWidget *parent)
mAddressLocationWidget = new AddressLocationWidget(this);
addWidget(mAddressLocationWidget);
mAddressLocationWidget->setObjectName(QStringLiteral("addresslocationwidget"));
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
mAddressesLocationViewer = new AddressesLocationEngineViewer(this);
mAddressesLocationViewer->setObjectName(QStringLiteral("addresseslocationviewer"));
addWidget(mAddressesLocationViewer);
......
......@@ -29,7 +29,7 @@
namespace Akonadi
{
class AddressLocationWidget;
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
class AddressesLocationEngineViewer;
#else
class AddressesLocationViewer;
......@@ -46,7 +46,7 @@ public:
void setReadOnly(bool readOnly);
private:
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
AddressesLocationEngineViewer *mAddressesLocationViewer;
#else
AddressesLocationViewer *mAddressesLocationViewer;
......
include(ECMMarkAsTest)
if (QTWEBENGINE_EXPERIMENTAL_OPTION)
if (QTWEBENGINE_SUPPORT_OPTION)
set(akonadicontact_addresslocation_web_editor_SRCS
../webengine/addresseslocationengineviewer.cpp
../webengine/addresseslocationenginepage.cpp
......
......@@ -22,7 +22,7 @@
#include "addresseslocationviewertest.h"
#include "config-akonadi-contact.h"
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
#include "../webengine/addresseslocationengineviewer.h"
#else
#include "../webkit/addresseslocationviewer.h"
......@@ -42,7 +42,7 @@ AddressesLocationViewerTest::~AddressesLocationViewerTest()
void AddressesLocationViewerTest::shouldHaveDefaultValue()
{
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
AddressesLocationEngineViewer w;
#else
AddressesLocationViewer w;
......
......@@ -22,7 +22,7 @@
#include "addresseslocationwidgettest.h"
#include "config-akonadi-contact.h"
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
#include "../webengine/addresseslocationengineviewer.h"
#else
#include "../webkit/addresseslocationviewer.h"
......@@ -50,7 +50,7 @@ void AddressesLocationWidgetTest::shouldHaveDefaultValue()
AddressLocationWidget *addressLocationWidget = w.findChild<AddressLocationWidget *>(QStringLiteral("addresslocationwidget"));
QVERIFY(addressLocationWidget);
#ifdef QTWEBENGINE_EXPERIMENTAL_OPTION
#ifdef QTWEBENGINE_SUPPORT_OPTION
AddressesLocationEngineViewer *addressesLocationViewer = w.findChild<AddressesLocationEngineViewer *>(QStringLiteral("addresseslocationviewer"));
QVERIFY(addressesLocationViewer);
#else
......
if (QTWEBENGINE_EXPERIMENTAL_OPTION)
if (QTWEBENGINE_SUPPORT_OPTION)
set(akonadicontact_addresslocation_web_editor_SRCS
../webengine/addresseslocationengineviewer.cpp
../webengine/addresseslocationenginepage.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment