It's unnecessary now

wilder-work
Montel Laurent 9 years ago
parent fe3cc22e38
commit 1d0753eeae
  1. 5
      CMakeLists.txt
  2. 1
      config-kmail.h.cmake
  3. 7
      src/configuredialog/configuremiscpage.cpp
  4. 2
      src/configuredialog/configuremiscpage.h

@ -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)

@ -1 +0,0 @@
#cmakedefine WEBENGINEVIEWER_PRINT_SUPPORT 1

@ -25,9 +25,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "MessageViewer/PrintingSettings"
#include "messageviewer/messageviewersettings.h"
#ifdef WEBENGINEVIEWER_PRINT_SUPPORT
#include "MessageViewer/PrintingSettings"
#endif
#include <KCModuleProxy>
#include <KCModuleInfo>
@ -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

@ -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

Loading…
Cancel
Save