Commit 59bb4d52 authored by Andre Heinecke's avatar Andre Heinecke

Only add kleopageconfigdialog to src when needed

The ifdef in the kleopageconfigdialog to only add code if
KCMUtils was not found breaks automoc as it still compiles
the moc for the class and then has undefined references.
parent 13925a73
......@@ -49,10 +49,6 @@ else()
endif()
endif()
if(HAVE_KCMUTILS)
set (_kleopatra_extra_libs KF5::KCMUtils)
endif()
if(HAVE_GPG_ERR_SOURCE_KLEO)
add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
else()
......@@ -209,7 +205,6 @@ set(_kleopatra_SRCS
${_kleopatra_uiserver_files}
conf/configuredialog.cpp
conf/kleopageconfigdialog.cpp
newcertificatewizard/listwidget.cpp
newcertificatewizard/newcertificatewizard.cpp
......@@ -223,6 +218,12 @@ set(_kleopatra_SRCS
main.cpp
)
if(HAVE_KCMUTILS)
set (_kleopatra_extra_libs KF5::KCMUtils)
else()
set (_kleopatra_SRCS conf/kleopageconfigdialog.cpp ${_kleopatra_SRCS})
endif()
ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME log_kleopatra)
if(KLEO_MODEL_TEST)
......
......@@ -53,7 +53,6 @@
*/
#include "config-kleopatra.h"
#if !HAVE_KCMUTILS
#include "kleopageconfigdialog.h"
......@@ -304,4 +303,3 @@ void KleoPageConfigDialog::clientChanged()
applyButton->setEnabled(change);
}
}
#endif
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