Commit bf89efae authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Clean up CMakeLists.txt (remove duplicate entries)

parent 77819379
Pipeline #46793 canceled with stage
......@@ -18,7 +18,6 @@ set(libknotesprivate_config_lib_SRCS
configdialog/knoteconfigdialog.cpp
configdialog/knotedisplayconfigwidget.cpp
configdialog/knoteeditorconfigwidget.cpp
configdialog/knotecollectionconfigwidget.cpp
)
set(libknotesprivate_print_lib_SRCS
......@@ -123,7 +122,12 @@ install(TARGETS knotes ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
########### next target ###############
set(kcm_knotes_PART_SRCS knoteconfigmodule.cpp kcm_knotes.cpp configdialog/knotedisplayconfigwidget.cpp configdialog/knoteeditorconfigwidget.cpp configdialog/knotecollectionconfigwidget.cpp knotes_debug.cpp)
set(kcm_knotes_PART_SRCS knoteconfigmodule.cpp kcm_knotes.cpp configdialog/knotecollectionconfigwidget.cpp)
ecm_qt_declare_logging_category(kcm_knotes_PART_SRCS HEADER knotes_kcm_debug.h IDENTIFIER KNOTES_MODULES_LOG CATEGORY_NAME org.kde.pim.knotes.module
DESCRIPTION "kcm knotes (knotes)"
OLD_CATEGORY_NAMES log_knotes_modules
EXPORT KNOTES
)
add_library(kcm_knote MODULE ${kcm_knotes_PART_SRCS} )
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
......
......@@ -27,7 +27,7 @@
#include <KLocalizedString>
#include <QPushButton>
#include <QLineEdit>
#include "knotes_debug.h"
#include "knotes_kcm_debug.h"
#include <KMessageBox>
#include <QVBoxLayout>
......@@ -322,11 +322,11 @@ void KNoteCollectionConfigWidget::slotModifyJobDone(KJob *job)
auto *modifyJob = qobject_cast<Akonadi::CollectionModifyJob *>(job);
if (modifyJob && job->error()) {
if (job->property("AttributeAdded").toBool()) {
qCWarning(KNOTES_LOG) << "Failed to append ShowFolderNotesAttribute to collection"
qCWarning(KNOTES_MODULES_LOG) << "Failed to append ShowFolderNotesAttribute to collection"
<< modifyJob->collection().id() << ":"
<< job->errorString();
} else {
qCWarning(KNOTES_LOG) << "Failed to remove ShowFolderNotesAttribute from collection"
qCWarning(KNOTES_MODULES_LOG) << "Failed to remove ShowFolderNotesAttribute from collection"
<< modifyJob->collection().id() << ":"
<< job->errorString();
}
......
......@@ -10,8 +10,6 @@
#include "knoteconfigdialog.h"
#include "notesharedglobalconfig.h"
#include "knotedisplayconfigwidget.h"
#include "knoteeditorconfigwidget.h"
#include "knotesglobalconfig.h"
#include "config/noteactionconfig.h"
#include "config/notenetworkconfig.h"
......
......@@ -7,13 +7,14 @@
#define KNOTEDISPLAYCONFIGWIDGET_H
#include <QWidget>
#include "knotes_export.h"
class KColorButton;
class QCheckBox;
class QSpinBox;
namespace NoteShared {
class NoteDisplayAttribute;
}
class KNoteDisplayConfigWidget : public QWidget
class KNOTES_EXPORT KNoteDisplayConfigWidget : public QWidget
{
Q_OBJECT
public:
......
......@@ -7,6 +7,7 @@
#define KNOTEEDITORCONFIGWIDGET_H
#include <QWidget>
#include "knotes_export.h"
class QSpinBox;
class QCheckBox;
class KFontRequester;
......@@ -14,7 +15,7 @@ namespace NoteShared {
class NoteDisplayAttribute;
}
class KNoteEditorConfigWidget : public QWidget
class KNOTES_EXPORT KNoteEditorConfigWidget : public QWidget
{
Q_OBJECT
public:
......
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