Commit eaa4c324 authored by Christophe Giboudeaux's avatar Christophe Giboudeaux
Browse files

Cleanup

parent 0cda6bc9
......@@ -26,8 +26,13 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KPIMIDENTITIES
)
########### Find packages ###########
find_package(KF5 ${KF5_VERSION} CONFIG REQUIRED COMPONENTS CoreAddons KDE4Support KIO Sonnet)
find_package(KF5PimUtils ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5 ${KF5_VERSION} CONFIG REQUIRED COMPONENTS CoreAddons KDE4Support KIO)
#find_package(Qt5 COMPONENTS Locale)
if(${CMAKE_SOURCE_DIR} STREQUAL ${KPimIdentities_SOURCE_DIR})
find_package(KF5PimUtils ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KF5_VERSION} CONFIG REQUIRED)
endif()
########### Targets ###########
add_subdirectory(src)
......
......@@ -21,8 +21,8 @@ target_link_libraries(KF5PimIdentities
KF5::CoreAddons
KF5::KDE4Support
KF5::KIOCore
KF5::PimTextEdit
KF5::PimUtils
KF5::SonnetCore
)
set_target_properties(KF5PimIdentities PROPERTIES
......
......@@ -21,7 +21,6 @@
#include "identity.h"
#include "signature.h"
#include <sonnet/globals.h>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <kpimutils/email.h>
......@@ -46,7 +45,8 @@ Identity::Identity( const QString &id, const QString &fullName,
setProperty( QLatin1String(s_email), emailAddr );
setProperty( QLatin1String(s_organization), organization );
setProperty( QLatin1String(s_replyto), replyToAddr );
setDictionary( Sonnet::defaultLanguageName() );
// FIXME KF5: Sonnet::defaultLanguageName is gone
//setDictionary( Sonnet::defaultLanguageName() );
setProperty( QLatin1String(s_disabledFcc), false );
setProperty( QLatin1String(s_defaultDomainName), QHostInfo::localHostName());
}
......
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