From 1d0753eeaee1f2011faee9ca50177dfba6ac54e2 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 14 Aug 2017 23:50:27 +0200 Subject: [PATCH] It's unnecessary now --- CMakeLists.txt | 5 ----- config-kmail.h.cmake | 1 - src/configuredialog/configuremiscpage.cpp | 7 ------- src/configuredialog/configuremiscpage.h | 2 -- 4 files changed, 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d34a13f6..f3481b4cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,11 +135,6 @@ find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED) find_package(MailTransportDBusService CONFIG REQUIRED) - -if (Qt5WebEngineWidgets_VERSION VERSION_GREATER "5.7.99") - set(WEBENGINEVIEWER_PRINT_SUPPORT true) -endif() - configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h ) configure_file(config-kmail.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmail.h) diff --git a/config-kmail.h.cmake b/config-kmail.h.cmake index 6b899bf9e..e69de29bb 100644 --- a/config-kmail.h.cmake +++ b/config-kmail.h.cmake @@ -1 +0,0 @@ -#cmakedefine WEBENGINEVIEWER_PRINT_SUPPORT 1 diff --git a/src/configuredialog/configuremiscpage.cpp b/src/configuredialog/configuremiscpage.cpp index e71920816..df0230d88 100644 --- a/src/configuredialog/configuremiscpage.cpp +++ b/src/configuredialog/configuremiscpage.cpp @@ -25,9 +25,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils; #include "MessageViewer/PrintingSettings" #include "messageviewer/messageviewersettings.h" -#ifdef WEBENGINEVIEWER_PRINT_SUPPORT #include "MessageViewer/PrintingSettings" -#endif #include #include @@ -54,10 +52,8 @@ MiscPage::MiscPage(QWidget *parent) InviteTab *inviteTab = new InviteTab(); addTab(inviteTab, i18n("Invitations")); -#ifdef WEBENGINEVIEWER_PRINT_SUPPORT MiscPagePrintingTab *printingTab = new MiscPagePrintingTab(); addTab(printingTab, i18n("Printing")); -#endif } QString MiscPageFolderTab::helpAnchor() const @@ -152,7 +148,6 @@ void MiscPage::InviteTab::doResetToDefaultsOther() mInvitationUi->doResetToDefaultsOther(); } -#ifdef WEBENGINEVIEWER_PRINT_SUPPORT MiscPagePrintingTab::MiscPagePrintingTab(QWidget *parent) : ConfigModuleTab(parent) { @@ -177,5 +172,3 @@ void MiscPagePrintingTab::save() { mPrintingUi->save(); } - -#endif diff --git a/src/configuredialog/configuremiscpage.h b/src/configuredialog/configuremiscpage.h index edd45df1b..8c2f90902 100644 --- a/src/configuredialog/configuremiscpage.h +++ b/src/configuredialog/configuremiscpage.h @@ -75,7 +75,6 @@ public: typedef MiscPageInviteTab InviteTab; }; -#ifdef WEBENGINEVIEWER_PRINT_SUPPORT class MiscPagePrintingTab : public ConfigModuleTab { Q_OBJECT @@ -90,6 +89,5 @@ private: private: MessageViewer::PrintingSettings *mPrintingUi; }; -#endif #endif // CONFIGUREMISCPAGE_H