Commit 2a9bdd63 authored by Laurent Montel's avatar Laurent Montel 😁

REname some variable. Fix install grantlee theme

parent d2a06c3a
......@@ -19,8 +19,8 @@
02110-1301, USA.
*/
#ifndef AKONADI_ABSTRACTCONTACTEDITORWIDGET_P_H
#define AKONADI_ABSTRACTCONTACTEDITORWIDGET_P_H
#ifndef CONTACTEDITOR_ABSTRACTCONTACTEDITORWIDGET_P_H
#define CONTACTEDITOR_ABSTRACTCONTACTEDITORWIDGET_P_H
#include <QWidget>
......
......@@ -19,8 +19,8 @@
02110-1301, USA.
*/
#ifndef AKONADI_CONTACTEDITORPAGEPLUGIN_H
#define AKONADI_CONTACTEDITORPAGEPLUGIN_H
#ifndef CONTACTEDITOR_CONTACTEDITORPAGEPLUGIN_H
#define CONTACTEDITOR_CONTACTEDITORPAGEPLUGIN_H
#include <QWidget>
......
......@@ -35,7 +35,7 @@ AddressesLocationGrantleeFormater::AddressesLocationGrantleeFormater(QObject *pa
{
mTemplateLoader = QSharedPointer<Grantlee::FileSystemTemplateLoader>(new Grantlee::FileSystemTemplateLoader);
mGrantleeThemePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QStringLiteral("akonadicontact/grantleetheme/default/"),
QStringLiteral("contacteditor/grantleetheme/default/"),
QStandardPaths::LocateDirectory);
changeGrantleePath(mGrantleeThemePath);
}
......
include(ECMMarkAsTest)
set(akonadicontact_addresslocation_web_editor_SRCS
set(contacteditor_addresslocation_web_editor_SRCS
../webengine/addresseslocationengineviewer.cpp
../webengine/addresseslocationenginepage.cpp
)
set(akonadicontact_webengine_LIB Qt5::WebEngine Qt5::WebEngineWidgets)
set(contacteditor_webengine_LIB Qt5::WebEngine Qt5::WebEngineWidgets)
ecm_qt_declare_logging_category(akonadicontact_addresslocation_web_editor_SRCS HEADER contacteditor_debug.h IDENTIFIER CONTACTEDITOR_LOG CATEGORY_NAME org.kde.pim.akonadi_contact)
ecm_qt_declare_logging_category(contacteditor_addresslocation_web_editor_SRCS HEADER contacteditor_debug.h IDENTIFIER CONTACTEDITOR_LOG CATEGORY_NAME org.kde.pim.contacteditor)
set(addresseslocationviewer_SRCS addresseslocationviewertest.cpp ${akonadicontact_addresslocation_web_editor_SRCS} ../addresseslocationgrantleeformater.cpp
set(addresseslocationviewer_SRCS addresseslocationviewertest.cpp ${contacteditor_addresslocation_web_editor_SRCS} ../addresseslocationgrantleeformater.cpp
../addressgrantleeobject.cpp ../iconnamecache.cpp)
add_executable(addresseslocationviewer ${addresseslocationviewer_SRCS})
add_test(addresseslocationviewer addresseslocationviewer)
ecm_mark_as_test(addresseslocationviewer)
target_link_libraries(addresseslocationviewer Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n ${akonadicontact_webengine_LIB} Grantlee5::Templates
target_link_libraries(addresseslocationviewer Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n ${contacteditor_webengine_LIB} Grantlee5::Templates
KF5::IconThemes KF5::WidgetsAddons)
set(addresslocationwidget_SRCS addresslocationwidgettest.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp ../addresstypedialog.cpp)
......@@ -22,10 +22,10 @@ add_test(addresslocationwidget addresslocationwidget)
ecm_mark_as_test(addresslocationwidget)
target_link_libraries(addresslocationwidget Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion)
set(addresseslocationwidget_SRCS addresseslocationwidgettest.cpp ../addresseslocationwidget.cpp ${akonadicontact_addresslocation_web_editor_SRCS} ../addresseslocationgrantleeformater.cpp
set(addresseslocationwidget_SRCS addresseslocationwidgettest.cpp ../addresseslocationwidget.cpp ${contacteditor_addresslocation_web_editor_SRCS} ../addresseslocationgrantleeformater.cpp
../addressgrantleeobject.cpp ../iconnamecache.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp ../addresstypedialog.cpp)
add_executable(addresseslocationwidget ${addresseslocationwidget_SRCS})
add_test(addresseslocationwidget addresseslocationwidget)
ecm_mark_as_test(addresseslocationwidget)
target_link_libraries(addresseslocationwidget Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion ${akonadicontact_webengine_LIB}
target_link_libraries(addresseslocationwidget Qt5::Test Qt5::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion ${contacteditor_webengine_LIB}
Grantlee5::Templates KF5::IconThemes KF5::WidgetsAddons)
install(DIRECTORY default DESTINATION ${KDE_INSTALL_DATADIR}/akonadicontact/grantleetheme/ )
install(DIRECTORY default DESTINATION ${KDE_INSTALL_DATADIR}/contacteditor/grantleetheme/ )
......@@ -19,12 +19,12 @@
02110-1301, USA.
*/
#ifndef AKONADI_CONTACT_IMPROTOCOLS_H
#define AKONADI_CONTACT_IMPROTOCOLS_H
#ifndef CONTACTEDITOR_CONTACT_IMPROTOCOLS_H
#define CONTACTEDITOR_CONTACT_IMPROTOCOLS_H
#include <kplugininfo.h>
#include "akonadi-contact_export.h"
#include "contacteditor_export.h"
class IMProtocolInfo
{
......@@ -42,7 +42,7 @@ private:
QString mIcon;
};
class AKONADI_CONTACT_EXPORT IMProtocols
class CONTACTEDITOR_EXPORT IMProtocols
{
public:
~IMProtocols();
......
......@@ -19,8 +19,8 @@
02110-1301, USA.
*/
#ifndef AKONADICONTACTCOMBOBOX_H
#define AKONADICONTACTCOMBOBOX_H
#ifndef CONTACTEDITORCONTACTCOMBOBOX_H
#define CONTACTEDITORCONTACTCOMBOBOX_H
#include <QComboBox>
#include "contacteditor_private_export.h"
......@@ -37,4 +37,4 @@ protected:
QSize minimumSizeHint() const override;
};
}
#endif // AKONADICONTACTCOMBOBOX_H
#endif // CONTACTEDITORCONTACTCOMBOBOX_H
......@@ -30,8 +30,8 @@
your version.
*/
#ifndef AKONADICONTACT_KWIDGETLISTER_H
#define AKONADICONTACT_KWIDGETLISTER_H
#ifndef CONTACTEDITORCONTACT_KWIDGETLISTER_H
#define CONTACTEDITORCONTACT_KWIDGETLISTER_H
#include <QWidget>
......
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