kdepim-runtime: adjust to recent changes

This commit is contained in:
Ivailo Monev 2015-09-25 12:06:19 +00:00
parent debd191d6b
commit b7327cfea8
83 changed files with 127 additions and 326 deletions

View file

@ -27,13 +27,6 @@ set(accountwizard_srcs
ispdb/ispdb.cpp
)
kde4_add_ui_files(accountwizard_srcs
ui/typepage.ui
ui/loadpage.ui
ui/setuppage.ui
ui/personaldatapage.ui
)
set(accountwizard_libs
${KDEPIMLIBS_AKONADI_LIBS}
${KDEPIMLIBS_MAILTRANSPORT_LIBS}
@ -49,11 +42,10 @@ set(accountwizard_libs
if ( NOT ACCOUNTWIZARD_NO_GHNS )
set(accountwizard_srcs ${accountwizard_srcs} providerpage.cpp)
kde4_add_ui_files(accountwizard_srcs ui/providerpage.ui)
set(accountwizard_libs ${accountwizard_libs} ${KDE4_KNEWSTUFF3_LIBS})
endif ()
kde4_add_executable(accountwizard ${accountwizard_srcs} main.cpp)
add_executable(accountwizard ${accountwizard_srcs} main.cpp)
target_link_libraries(accountwizard ${accountwizard_libs})
kde4_add_plugin(accountwizard_plugin ${accountwizard_srcs} inprocess-main.cpp)

View file

@ -23,6 +23,7 @@
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kross/core/action.h>
#include <klocale.h>
#include <QtCore/qfile.h>
LoadPage::LoadPage(KAssistantDialog* parent) :

View file

@ -33,6 +33,7 @@
#include <mailtransport/transport.h>
#include <KLocale>
#include <KDebug>

View file

@ -21,6 +21,7 @@
#include "providerpage.h"
#include "global.h"
#include <KLocale>
#include <KDebug>
#include <QSortFilterProxyModel>

View file

@ -27,6 +27,7 @@
#include <kemailsettings.h>
#include <kwallet.h>
#include <klocale.h>
SetupManager::SetupManager( QWidget* parent) :
QObject(parent),

View file

@ -19,6 +19,8 @@
#include "typepage.h"
#include <KIcon>
#include <KConfigGroup>
#include <KDebug>
#include <KDesktopFile>
#include <KStandardDirs>
@ -32,10 +34,6 @@ TypePage::TypePage(KAssistantDialog* parent) :
m_model( new QStandardItemModel( this ) )
{
ui.setupUi( this );
#ifdef KDEPIM_MOBILE_UI
ui.label->setHidden( true );
ui.searchLine->setHidden( true );
#endif
#ifdef ACCOUNTWIZARD_NO_GHNS
ui.ghnsButton->hide();

View file

@ -7,7 +7,7 @@ macro(kdepim_add_agent _target)
kde4_add_plugin(${_target} ${ARGN})
install( TARGETS ${_target} DESTINATION ${PLUGIN_INSTALL_DIR}/ )
else()
kde4_add_executable(${_target} ${ARGN})
add_executable(${_target} ${ARGN})
install(TARGETS ${_target} ${INSTALL_TARGETS_DEFAULT_ARGS})
endif()
endmacro()

View file

@ -13,7 +13,7 @@ set( invitationsagent_SRCS
## ${KDE4_DBUS_INTERFACES_DIR}/org.kde.Akonadi.MailDispatcher.xml invitationsagent.h MailDispatcherAgent
## )
kde4_add_executable(akonadi_invitations_agent ${invitationsagent_SRCS})
add_executable(akonadi_invitations_agent ${invitationsagent_SRCS})
target_link_libraries(akonadi_invitations_agent
${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}
@ -24,12 +24,5 @@ target_link_libraries(akonadi_invitations_agent
${KDEPIMLIBS_KCALCORE_LIBS}
)
if (Q_WS_MAC)
set_target_properties(akonadi_invitations_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_invitations_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.invitationsagent")
set_target_properties(akonadi_invitations_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Invitations Calendar")
endif ()
install(TARGETS akonadi_invitations_agent ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES invitationsagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")

View file

@ -1,4 +1,6 @@
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( autotests )
endif()
set( maildispatcheragent_SRCS
maildispatcheragent.cpp
@ -9,7 +11,6 @@ set( maildispatcheragent_SRCS
#configdialog.cpp
)
kde4_add_ui_files(maildispatcheragent_SRCS settings.ui)
kde4_add_kcfg_files(maildispatcheragent_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/maildispatcheragent.kcfg org.kde.Akonadi.MailDispatcher.Settings)
qt4_add_dbus_adaptor(maildispatcheragent_SRCS

View file

@ -14,13 +14,7 @@ set(migrationagent_SRCS
tests/dummymigrator.cpp
)
kde4_add_executable(akonadi_migration_agent ${migrationagent_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_migration_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_migration_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.migrationagent")
set_target_properties(akonadi_migration_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Migrationagent")
endif ()
add_executable(akonadi_migration_agent ${migrationagent_SRCS})
target_link_libraries(akonadi_migration_agent
gidmigration
@ -37,4 +31,6 @@ target_link_libraries(akonadi_migration_agent
install(TARGETS akonadi_migration_agent ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES migrationagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
add_subdirectory(tests)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()

View file

@ -26,9 +26,7 @@ kde4_add_kcfg_files(newmailnotifieragent_SRCS
qt4_add_dbus_adaptor(newmailnotifieragent_SRCS org.freedesktop.Akonadi.NewMailNotifier.xml newmailnotifieragent.h NewMailNotifierAgent)
kde4_add_executable( akonadi_newmailnotifier_agent ${newmailnotifieragent_SRCS})
add_executable( akonadi_newmailnotifier_agent ${newmailnotifieragent_SRCS})
target_link_libraries( akonadi_newmailnotifier_agent
${KDEPIMLIBS_AKONADI_LIBS}
@ -43,17 +41,9 @@ target_link_libraries( akonadi_newmailnotifier_agent
${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
)
if (Q_WS_MAC)
set_target_properties( akonadi_newmailnotifier_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)
set_target_properties( akonadi_newmailnotifier_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.newmailnotifier")
set_target_properties( akonadi_newmailnotifier_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE New Mail Notifier")
endif ()
install(TARGETS akonadi_newmailnotifier_agent ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES newmailnotifieragent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
install(FILES akonadi_newmailnotifier_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_newmailnotifier_agent" )
add_subdirectory(kconf_update)

View file

@ -1 +0,0 @@
install( FILES newmailnotifier.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})

View file

@ -1,6 +0,0 @@
# Migrate kmail's notifier setting to Akonadi new mail notifier
Id=initial-newmailnotifier-migration
File=kmail2rc,akonadi_newmailnotifier_agentrc
Group=General,General
Key=beep-on-mail,beepOnNewMails
Key=VerboseNewMailNotification,verboseNotification

View file

@ -4,16 +4,11 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
include_directories( ${kdepim-runtime_SOURCE_DIR} )
set(akonadi_resources_kcm_srcs configmodule.cpp resourcesmanagementwidget.cpp)
kde4_add_ui_files(akonadi_resources_kcm_srcs resourcesmanagementwidget.ui )
kde4_add_plugin(kcm_akonadi_resources ${akonadi_resources_kcm_srcs})
target_link_libraries(kcm_akonadi_resources ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_AKONADI_LIBS})
set(akonadi_server_kcm_srcs serverconfigmodule.cpp)
kde4_add_ui_files(akonadi_server_kcm_srcs serverconfigmodule.ui
servermysqlstorage.ui
serverpsqlstorage.ui
serverstoragedriver.ui)
kde4_add_plugin(kcm_akonadi_server ${akonadi_server_kcm_srcs})
target_link_libraries(kcm_akonadi_server ${KDE4_KIO_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${AKONADI_COMMON_LIBRARIES})

View file

@ -30,8 +30,8 @@
#include <akonadi/agenttypedialog.h>
#include <akonadi/control.h>
#include <kwindowsystem.h>
#include <KWindowSystem>
#include <KLocale>
#include <KDebug>
#include <KMessageBox>
#include <KLineEdit>

View file

@ -1,5 +1,7 @@
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_subdirectory( tests )
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
@ -15,7 +17,7 @@ set(kdepim-copy_LIB_SRCS
kincidencechooser.cpp
)
kde4_add_library(kdepim-copy ${LIBRARY_TYPE} ${kdepim-copy_LIB_SRCS})
add_library(kdepim-copy ${LIBRARY_TYPE} ${kdepim-copy_LIB_SRCS})
target_link_libraries(kdepim-copy
${KDE4_KDEUI_LIBS}

View file

@ -35,6 +35,8 @@ add_subdirectory( gid )
if (KDEPIMLIBS_KRESOURCES_LIBS)
add_subdirectory( knotes )
add_subdirectory( kres )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
endif ()

View file

@ -4,7 +4,7 @@ set(gid_SRCS
${MIGRATION_AKONADI_SHARED_SOURCES}
)
kde4_add_library(gidmigration STATIC ${gid_SRCS})
add_library(gidmigration STATIC ${gid_SRCS})
target_link_libraries(gidmigration
${QT_QTCORE_LIBRARY}
${KDE4_KDECORE_LIBS}
@ -13,7 +13,7 @@ target_link_libraries(gidmigration
${KDEPIMLIBS_KMIME_LIBS}
)
kde4_add_executable(gidmigrator main.cpp)
add_executable(gidmigrator main.cpp)
target_link_libraries(gidmigrator
gidmigration
${QT_QTCORE_LIBRARY}

View file

@ -1,6 +1,6 @@
set( kaddressbookmigrator_SRCS kaddressbookmigrator.cpp )
kde4_add_executable( kaddressbookmigrator ${kaddressbookmigrator_SRCS} )
add_executable( kaddressbookmigrator ${kaddressbookmigrator_SRCS} )
target_link_libraries(kaddressbookmigrator ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS})

View file

@ -21,7 +21,7 @@ endmacro()
add_resource_iface( maildir/maildirresource.kcfg
org.kde.Akonadi.Maildir.Settings MaildirSettings )
kde4_add_executable( kjotsmigrator ${kjotsmigrator_SRCS} )
add_executable( kjotsmigrator ${kjotsmigrator_SRCS} )
target_link_libraries(kjotsmigrator
${QT_QTXML_LIBRARY}

View file

@ -41,8 +41,7 @@ add_resource_iface( maildir/maildirresource.kcfg
add_resource_iface( mixedmaildir/mixedmaildirresource.kcfg
org.kde.Akonadi.MixedMaildir.Settings MixedMaildirSettings )
kde4_add_app_icon(kmail-migrator_srcs "${KDE4_ICON_DIR}/oxygen/*/apps/akonadi.png")
kde4_add_executable(kmail-migrator ${kmail-migrator_srcs} )
add_executable(kmail-migrator ${kmail-migrator_srcs} )
target_link_libraries(kmail-migrator
${KDEPIMLIBS_KMBOX_LIBS}
${KDEPIMLIBS_KMIME_LIBS}

View file

@ -22,7 +22,7 @@ endmacro()
add_resource_iface( maildir/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings MaildirSettings )
kde4_add_executable(knotes-migrator ${knotes-migrator_srcs})
add_executable(knotes-migrator ${knotes-migrator_srcs})
target_link_libraries(knotes-migrator
${KDEPIMLIBS_AKONADI_LIBS}

View file

@ -20,8 +20,7 @@ add_resource_iface( birthdays/birthdaysresource.kcfg org.kde.Akonadi.Birthdays.S
add_resource_iface( maildir/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings MaildirSettings )
add_resource_iface( dav/resource/davgroupwareresource.kcfg org.kde.Akonadi.davGroupware.Settings DavSettings )
kde4_add_app_icon(kres-migrator_srcs "${KDE4_ICON_DIR}/oxygen/*/apps/akonadi.png")
kde4_add_executable(kres-migrator ${kres-migrator_srcs})
add_executable(kres-migrator ${kres-migrator_srcs})
target_link_libraries(kres-migrator
${KDEPIMLIBS_AKONADI_LIBS}

View file

@ -1,7 +1,10 @@
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
include_directories(
${Boost_INCLUDE_DIR}

View file

@ -11,6 +11,8 @@ install(FILES
DESTINATION ${PLUGIN_INSTALL_DIR}/imports/org/kde/akonadi
)
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
endif ()

View file

@ -24,8 +24,6 @@ set( akonotesresource_SRCS
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/../maildir/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings)
kde4_add_ui_files(akonotesresource_SRCS ../maildir/settings.ui)
kde4_add_kcfg_files(akonotesresource_SRCS ../maildir/settings.kcfgc)
qt4_add_dbus_adaptor(akonotesresource_SRCS

View file

@ -9,19 +9,11 @@ set( birthdayresource_srcs
kde4_add_kcfg_files( birthdayresource_srcs settings.kcfgc )
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/birthdaysresource.kcfg org.kde.Akonadi.Birthdays.Settings)
kde4_add_ui_files(birthdayresource_srcs configdialog.ui)
qt4_add_dbus_adaptor(birthdayresource_srcs
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Birthdays.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_birthdays_resource ${birthdayresource_srcs})
if (Q_WS_MAC)
set_target_properties(akonadi_birthdays_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_birthdays_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.Birthdays")
set_target_properties(akonadi_birthdays_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Birthdays Resource")
endif ()
add_executable(akonadi_birthdays_resource ${birthdayresource_srcs})
target_link_libraries(akonadi_birthdays_resource
${KDE4_KIO_LIBS}

View file

@ -22,6 +22,7 @@
#include "settings.h"
#include <kconfigdialogmanager.h>
#include <klocale.h>
ConfigDialog::ConfigDialog(QWidget* parent)
: KDialog( parent )

View file

@ -14,7 +14,6 @@ set( contactsresource_SRCS
settingsdialog.cpp
)
kde4_add_ui_files(contactsresource_SRCS settingsdialog.ui)
kde4_add_kcfg_files(contactsresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/contactsresource.kcfg org.kde.Akonadi.Contacts.Settings)
qt4_add_dbus_adaptor(contactsresource_SRCS

View file

@ -23,6 +23,8 @@
#include "contactsresourcesettingsadaptor.h"
#include "settingsdialog.h"
#include <KLocale>
#include <QtCore/QDir>
#include <QtCore/QDirIterator>
#include <QtCore/QFile>

View file

@ -69,13 +69,12 @@ if (QT_QTXMLPATTERNS_LIBRARY)
install( FILES ${providersFiles} DESTINATION "${SERVICES_INSTALL_DIR}/akonadi/davgroupware-providers" )
kde4_add_kcfg_files(davgroupwareresource_SRCS settingsbase.kcfgc)
kde4_add_ui_files(davgroupwareresource_SRCS configdialog.ui urlconfigurationdialog.ui searchdialog.ui)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/davgroupwareresource.kcfg org.kde.Akonadi.davGroupware.Settings)
qt4_add_dbus_adaptor(davgroupwareresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.davGroupware.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_davgroupware_resource RUN_UNINSTALLED ${davgroupwareresource_SRCS})
add_executable(akonadi_davgroupware_resource ${davgroupwareresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_davgroupware_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../../Info.plist.template)

View file

@ -43,6 +43,7 @@
#include <kcalcore/todo.h>
#include <kdatetime.h>
#include <kjob.h>
#include <klocale.h>
#include <akonadi/attributefactory.h>
#include <akonadi/cachepolicy.h>

View file

@ -28,6 +28,7 @@
#include <KIcon>
#include <KMessageBox>
#include <KUrl>
#include <KLocale>
#include <QtGui/QStandardItemModel>

View file

@ -24,6 +24,7 @@
#include "settings.h"
#include <kmessagebox.h>
#include <klocale.h>
#include <QtGui/QStandardItem>
#include <QtGui/QStandardItemModel>

View file

@ -23,6 +23,8 @@
#include "davutils.h"
#include <KDialog>
#include <QtCore/QString>
class KJob;

View file

@ -15,7 +15,7 @@ set(folderarchivesettings_SRCS
folderarchiveaccountinfo.cpp
)
kde4_add_library(folderarchivesettings ${LIBRARY_TYPE} ${folderarchivesettings_SRCS} )
add_library(folderarchivesettings ${LIBRARY_TYPE} ${folderarchivesettings_SRCS} )
target_link_libraries(folderarchivesettings
${KDEPIMLIBS_KMIME_LIBS}
@ -27,5 +27,9 @@ target_link_libraries(folderarchivesettings
set_target_properties(folderarchivesettings PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS folderarchivesettings ${INSTALL_TARGETS_DEFAULT_ARGS})
add_subdirectory(autotests)
if(ENABLE_TESTING)
add_subdirectory( autotests )
endif()

View file

@ -24,7 +24,6 @@ set( icalresource_SRCS
install( FILES icalresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(icalresource_SRCS ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
kde4_add_kcfg_files(icalresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/icalresource.kcfg org.kde.Akonadi.ICal.Settings)
qt4_add_dbus_adaptor(icalresource_SRCS
@ -33,12 +32,6 @@ qt4_add_dbus_adaptor(icalresource_SRCS
kde4_add_plugin(akonadi_ical_resource ${icalresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_ical_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_ical_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.ICal")
set_target_properties(akonadi_ical_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi ICal Resource")
endif ()
target_link_libraries(akonadi_ical_resource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTDBUS_LIBRARY} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS})
install(TARGETS akonadi_ical_resource DESTINATION ${PLUGIN_INSTALL_DIR})

View file

@ -21,7 +21,6 @@ set( notesresource_SRCS
install( FILES notesresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(notesresource_SRCS ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
kde4_add_kcfg_files(notesresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/notesresource.kcfg org.kde.Akonadi.Notes.Settings)
qt4_add_dbus_adaptor(notesresource_SRCS

View file

@ -5,6 +5,7 @@ include_directories(
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
set(CMAKE_AUTOUIC OFF)
########### next target ###############
@ -13,7 +14,8 @@ set( icaldirresource_SRCS
../shared/dirsettingsdialog.cpp
)
kde4_add_ui_files(icaldirresource_SRCS settingsdialog.ui)
qt4_wrap_ui(icaldirresource_SRCS settingsdialog.ui)
kde4_add_kcfg_files(icaldirresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/icaldirresource.kcfg org.kde.Akonadi.ICalDirectory.Settings)
qt4_add_dbus_adaptor(icaldirresource_SRCS
@ -22,14 +24,7 @@ qt4_add_dbus_adaptor(icaldirresource_SRCS
install( FILES icaldirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_executable(akonadi_icaldir_resource ${icaldirresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_icaldir_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_icaldir_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.ICalDirectory")
set_target_properties(akonadi_icaldir_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi ICalDirectory Resource")
endif ()
add_executable(akonadi_icaldir_resource ${icaldirresource_SRCS})
target_link_libraries(akonadi_icaldir_resource
${KDEPIMLIBS_AKONADI_LIBS}

View file

@ -28,6 +28,7 @@
#include <akonadi/entitydisplayattribute.h>
#include <akonadi/itemfetchscope.h>
#include <KLocale>
#include <KCalCore/MemoryCalendar>
#include <KCalCore/FileStorage>
#include <KCalCore/ICalFormat>

View file

@ -66,7 +66,7 @@ qt4_add_dbus_adaptor( imapresource_LIB_SRCS
imapresourcebase.h ImapResourceBase
)
kde4_add_library(imapresource STATIC ${imapresource_LIB_SRCS})
add_library(imapresource STATIC ${imapresource_LIB_SRCS})
target_link_libraries(imapresource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDEPIMLIBS_KIMAP_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS})
@ -86,20 +86,11 @@ set( akonadi_imap_resource_SRCS
install( FILES imapresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
if (KDEPIM_MOBILE_UI)
kde4_add_ui_files(akonadi_imap_resource_SRCS setupserverview_mobile.ui)
else ()
kde4_add_ui_files(akonadi_imap_resource_SRCS setupserverview_desktop.ui)
endif ()
kde4_add_ui_files(akonadi_imap_resource_SRCS serverinfo.ui)
if (RUNTIME_PLUGINS_STATIC)
add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
endif ()
kde4_add_executable(akonadi_imap_resource ${akonadi_imap_resource_SRCS})
add_executable(akonadi_imap_resource ${akonadi_imap_resource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_imap_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
@ -120,4 +111,6 @@ endif()
install(TARGETS akonadi_imap_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
add_subdirectory( wizard )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()

View file

@ -27,14 +27,7 @@ set( kabcresource_SRCS
install( FILES kabcresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_executable(akonadi_kabc_resource ${kabcresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_kabc_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_kabc_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.KABC")
set_target_properties(akonadi_kabc_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi KABC Resource")
endif ()
add_executable(akonadi_kabc_resource ${kabcresource_SRCS})
target_link_libraries(akonadi_kabc_resource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KIO_LIBS})

View file

@ -22,7 +22,6 @@ set(kalarmresource_SRCS
install(FILES kalarmresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
kde4_add_ui_files(kalarmresource_SRCS ../shared/alarmtyperadiowidget.ui ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
kde4_add_kcfg_files(kalarmresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
qt4_add_dbus_adaptor(kalarmresource_SRCS

View file

@ -18,7 +18,6 @@ set(kalarmdirresource_SRCS
install(FILES kalarmdirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
kde4_add_ui_files(kalarmdirresource_SRCS settingsdialog.ui ../shared/alarmtypewidget.ui)
kde4_add_kcfg_files(kalarmdirresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmdirresource.kcfg org.kde.Akonadi.KAlarmDir.Settings)
qt4_add_dbus_adaptor(kalarmdirresource_SRCS

View file

@ -0,0 +1 @@
../shared/alarmtyperadiowidget.ui

View file

@ -0,0 +1 @@
../shared/alarmtypewidget.ui

View file

@ -25,6 +25,7 @@
#include <KConfigDialogManager>
#include <KWindowSystem>
#include <KLocale>
#include <QTimer>

View file

@ -29,7 +29,7 @@ set( kcalresource_SRCS
install( FILES kcalresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_executable(akonadi_kcal_resource ${kcalresource_SRCS})
add_executable(akonadi_kcal_resource ${kcalresource_SRCS})
target_link_libraries(akonadi_kcal_resource ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KCAL_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KIO_LIBS})

View file

@ -14,20 +14,13 @@ set( kdeaccountsresource_SRCS
install( FILES kdeaccountsresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(kdeaccountsresource_SRCS ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
kde4_add_kcfg_files(kdeaccountsresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kdeaccountsresource.kcfg org.kde.Akonadi.KDEAccounts.Settings)
qt4_add_dbus_adaptor(kdeaccountsresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KDEAccounts.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_kdeaccounts_resource ${kdeaccountsresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_kdeaccounts_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_kdeaccounts_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.KDEAccounts")
set_target_properties(akonadi_kdeaccounts_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi KDEAccounts Resource")
endif ()
add_executable(akonadi_kdeaccounts_resource ${kdeaccountsresource_SRCS})
target_link_libraries(akonadi_kdeaccounts_resource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KIO_LIBS})

View file

@ -22,13 +22,7 @@ qt4_add_dbus_adaptor(localbookmarksresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.LocalBookmarks.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_localbookmarks_resource ${localbookmarksresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_localbookmarks_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_localbookmarks_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.LocalBookmarks")
set_target_properties(akonadi_localbookmarks_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi LocalBookmarks Resource")
endif ()
add_executable(akonadi_localbookmarks_resource ${localbookmarksresource_SRCS})
target_link_libraries(akonadi_localbookmarks_resource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTDBUS_LIBRARY} ${KDE4_KIO_LIBS})

View file

@ -7,7 +7,10 @@ include_directories(
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
add_subdirectory( wizard )
# maildir access library
@ -25,8 +28,6 @@ set( maildirresource_SRCS
install( FILES maildirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(maildirresource_SRCS settings.ui)
kde4_add_kcfg_files(maildirresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings)

View file

@ -26,6 +26,7 @@
#include <kconfigdialogmanager.h>
#include <kurlrequester.h>
#include <klineedit.h>
#include <klocale.h>
using KPIM::Maildir;
using namespace Akonadi_Maildir_Resource;

View file

@ -1,9 +1,11 @@
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
kde4_add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
target_link_libraries(maildir ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${QT_QTNETWORK_LIBRARY})

View file

@ -8,14 +8,13 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5324)
install( FILES mtdummyresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(mtdummyresource_SRCS settings.ui)
kde4_add_kcfg_files(mtdummyresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/mtdummyresource.kcfg org.kde.Akonadi.MailTransportDummy.Settings)
qt4_add_dbus_adaptor(mtdummyresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.MailTransportDummy.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_mailtransport_dummy_resource ${mtdummyresource_SRCS})
add_executable(akonadi_mailtransport_dummy_resource ${mtdummyresource_SRCS})
target_link_libraries(akonadi_mailtransport_dummy_resource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})

View file

@ -25,6 +25,7 @@
#include "settingsadaptor.h"
#include <KWindowSystem>
#include <KLocale>
#include <QtDBus/QDBusConnection>

View file

@ -20,11 +20,6 @@ set( mboxresource_SRCS
install( FILES mboxresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(mboxresource_SRCS
${AKONADI_SINGLEFILERESOURCE_SHARED_UI}
compactpage.ui
lockfilepage.ui
)
kde4_add_kcfg_files(mboxresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/mboxresource.kcfg org.kde.Akonadi.Mbox.Settings)
qt4_add_dbus_adaptor(mboxresource_SRCS
@ -33,12 +28,6 @@ qt4_add_dbus_adaptor(mboxresource_SRCS
kde4_add_plugin(akonadi_mbox_resource ${mboxresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.Mbox")
set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Mbox Resource")
endif ()
target_link_libraries(akonadi_mbox_resource ${KDEPIMLIBS_KMBOX_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${QT_QTDBUS_LIBRARY} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS})
install(TARGETS akonadi_mbox_resource DESTINATION ${PLUGIN_INSTALL_DIR})

View file

@ -25,6 +25,9 @@
#include "deleteditemsattribute.h"
#include <KLocale>
#include <KUrl>
#include <QFileInfo>
using namespace Akonadi;

View file

@ -29,8 +29,6 @@ set( mixedmaildirresource_SRCS
install( FILES mixedmaildirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(mixedmaildirresource_SRCS settings.ui)
kde4_add_kcfg_files(mixedmaildirresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/mixedmaildirresource.kcfg org.kde.Akonadi.MixedMaildir.Settings)
@ -39,7 +37,7 @@ qt4_add_dbus_adaptor(mixedmaildirresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.MixedMaildir.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_mixedmaildir_resource ${mixedmaildirresource_SRCS})
add_executable(akonadi_mixedmaildir_resource ${mixedmaildirresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_mixedmaildir_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
@ -64,7 +62,6 @@ install(TARGETS akonadi_mixedmaildir_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.MixedMaildir.Settings.xml
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
# unit tests
if (KDE4_BUILD_TESTS)
if(ENABLE_TESTING)
add_subdirectory( tests )
endif ()
endif()

View file

@ -25,6 +25,7 @@
#include <kconfigdialogmanager.h>
#include <kurlrequester.h>
#include <klineedit.h>
#include <klocale.h>
using KPIM::Maildir;

View file

@ -3,7 +3,9 @@ include_directories(
${KDE4_INCLUDES}
)
add_subdirectory(tests)
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
########### next target ###############
@ -11,7 +13,7 @@ set(kmindexreader_LIB_SRCS
kmindexreader.cpp
)
kde4_add_library(kmindexreader ${LIBRARY_TYPE} ${kmindexreader_LIB_SRCS})
add_library(kmindexreader ${LIBRARY_TYPE} ${kmindexreader_LIB_SRCS})
target_link_libraries(kmindexreader
${KDE4_KDECORE_LIBS}

View file

@ -20,16 +20,8 @@ kcfg_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/nntpresource.kcfg org.
qt4_add_dbus_adaptor( nntpresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.NNTP.Settings.xml settings.h Settings
)
kde4_add_ui_files(nntpresource_SRCS configdialog.ui)
kde4_add_kcfg_files(nntpresource_SRCS settingsbase.kcfgc)
kde4_add_executable(akonadi_nntp_resource ${nntpresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_nntp_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_nntp_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.NNTP")
set_target_properties(akonadi_nntp_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi NNTP Resource")
endif ()
add_executable(akonadi_nntp_resource ${nntpresource_SRCS})
target_link_libraries(akonadi_nntp_resource ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${QT_QTCORE_LIBRARY})

View file

@ -21,6 +21,7 @@
#include "settings.h"
#include <kconfigdialogmanager.h>
#include <klocale.h>
ConfigDialog::ConfigDialog(QWidget * parent) :
KDialog( parent )

View file

@ -36,6 +36,7 @@
#include <kmime/kmime_newsarticle.h>
#include <kmime/kmime_util.h>
#include <KLocale>
#include <KWindowSystem>
#include <QDateTime>

View file

@ -34,7 +34,6 @@ set( openxchangeresource_SRCS
openxchangeresource.cpp
)
kde4_add_ui_files( openxchangeresource_SRCS configdialog.ui )
install( FILES openxchangeresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
@ -44,7 +43,7 @@ qt4_add_dbus_adaptor(openxchangeresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.OpenXchange.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_openxchange_resource RUN_UNINSTALLED ${openxchangeresource_SRCS})
add_executable(akonadi_openxchange_resource ${openxchangeresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_openxchange_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)

View file

@ -21,6 +21,7 @@
#include "users.h"
#include <QtCore/QDataStream>
#include <QtCore/QFile>
#include <kstandarddirs.h>

View file

@ -37,21 +37,13 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5266)
install( FILES pop3resource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files( pop3resource_SRCS popsettings.ui)
kde4_add_kcfg_files(pop3resource_SRCS settingsbase.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/settings.kcfg org.kde.Akonadi.POP3.Settings)
qt4_add_dbus_adaptor(pop3resource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.POP3.Settings.xml settings.h Settings
)
kde4_add_executable(akonadi_pop3_resource RUN_UNINSTALLED ${pop3resource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_pop3_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_pop3_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.POP3")
set_target_properties(akonadi_pop3_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi POP3 Resource")
endif ()
add_executable(akonadi_pop3_resource ${pop3resource_SRCS})
target_link_libraries( akonadi_pop3_resource
${KDEPIMLIBS_AKONADI_LIBS}
@ -66,7 +58,9 @@ target_link_libraries( akonadi_pop3_resource
${KDEPIMLIBS_KPIMUTILS_LIBS}
)
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
add_subdirectory( wizard )
install(TARGETS akonadi_pop3_resource ${INSTALL_TARGETS_DEFAULT_ARGS})

View file

@ -35,6 +35,7 @@
#include <KPasswordDialog>
#include <KMessageBox>
#include <kwallet.h>
#include <klocale.h>
#include <QTimer>

View file

@ -1,2 +1,4 @@
add_subdirectory(filestore)
add_subdirectory(tests)
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()

View file

@ -21,6 +21,7 @@
#include "settings.h"
#include <KLocale>
#include <KConfigDialogManager>
#include <KWindowSystem>

View file

@ -32,7 +32,7 @@ set(akonadi-filestore_SRCS
storecompactjob.cpp
)
kde4_add_library(akonadi-filestore ${LIBRARY_TYPE} ${akonadi-filestore_SRCS} )
add_library(akonadi-filestore ${LIBRARY_TYPE} ${akonadi-filestore_SRCS} )
target_link_libraries(akonadi-filestore
${AKONADI_COMMON_LIBRARIES}
@ -46,7 +46,7 @@ set_target_properties(akonadi-filestore PROPERTIES VERSION ${GENERIC_LIB_VERSION
install(TARGETS akonadi-filestore ${INSTALL_TARGETS_DEFAULT_ARGS})
if (KDE4_BUILD_TESTS)
if(ENABLE_TESTING)
add_subdirectory( tests )
endif ()
endif()

View file

@ -1,108 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SingleFileResourceConfigDialog</class>
<widget class="QWidget" name="SingleFileResourceConfigDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>487</width>
<height>183</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="5" column="0">
<widget class="KTabWidget" name="ktabwidget">
<widget class="QWidget" name="tab">
<attribute name="title">
<string>File</string>
</attribute>
<layout class="QVBoxLayout" name="tabLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Filename:</string>
</property>
<property name="buddy">
<cstring>kcfg_Path</cstring>
</property>
</widget>
</item>
<item>
<widget class="KUrlRequester" name="kcfg_Path"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>&amp;Display name:</string>
</property>
<property name="buddy">
<cstring>kcfg_DisplayName</cstring>
</property>
</widget>
</item>
<item>
<widget class="KLineEdit" name="kcfg_DisplayName"/>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="kcfg_ReadOnly">
<property name="text">
<string>Read only</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_MonitorFile">
<property name="text">
<string>Enable file &amp;monitoring</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
<class>KUrlRequester</class>
<extends>QFrame</extends>
<header>kurlrequester.h</header>
</customwidget>
<customwidget>
<class>KTabWidget</class>
<extends>QTabWidget</extends>
<header>ktabwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

View file

@ -26,6 +26,7 @@
#include <KFileItem>
#include <KIO/Job>
#include <KWindowSystem>
#include <KLocale>
#include <QTimer>

View file

@ -22,11 +22,7 @@
#ifndef AKONADI_SINGLEFILERESOURCECONFIGDIALOGBASE_H
#define AKONADI_SINGLEFILERESOURCECONFIGDIALOGBASE_H
#ifdef KDEPIM_MOBILE_UI
#include "ui_singlefileresourceconfigdialog_mobile.h"
#else
#include "ui_singlefileresourceconfigdialog_desktop.h"
#endif
#include <KDE/KDialog>

View file

@ -4,7 +4,9 @@ include_directories(
)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory( tests )
endif()
########### next target ###############
@ -15,7 +17,6 @@ set( vcardresource_SRCS
install( FILES vcardresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_ui_files(vcardresource_SRCS ${AKONADI_SINGLEFILERESOURCE_SHARED_UI})
kde4_add_kcfg_files(vcardresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/vcardresource.kcfg org.kde.Akonadi.VCard.Settings)
qt4_add_dbus_adaptor(vcardresource_SRCS
@ -26,12 +27,6 @@ kde4_add_plugin(akonadi_vcard_resource ${vcardresource_SRCS})
add_subdirectory( wizard )
if (Q_WS_MAC)
set_target_properties(akonadi_vcard_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_vcard_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.VCard")
set_target_properties(akonadi_vcard_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi VCard Resource")
endif ()
target_link_libraries(akonadi_vcard_resource ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS akonadi_vcard_resource DESTINATION ${PLUGIN_INSTALL_DIR})

View file

@ -5,6 +5,7 @@ include_directories(
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
set(CMAKE_AUTOUIC OFF)
########### next target ###############
@ -13,7 +14,8 @@ set( vcarddirresource_SRCS
../shared/dirsettingsdialog.cpp
)
kde4_add_ui_files(vcarddirresource_SRCS settingsdialog.ui)
qt4_wrap_ui(vcarddirresource_SRCS settingsdialog.ui)
kde4_add_kcfg_files(vcarddirresource_SRCS settings.kcfgc)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/vcarddirresource.kcfg org.kde.Akonadi.VCardDirectory.Settings)
qt4_add_dbus_adaptor(vcarddirresource_SRCS
@ -22,14 +24,7 @@ qt4_add_dbus_adaptor(vcarddirresource_SRCS
install( FILES vcarddirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_executable(akonadi_vcarddir_resource ${vcarddirresource_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_vcarddir_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_vcarddir_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.VCardDirectory")
set_target_properties(akonadi_vcarddir_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi VCardDirectory Resource")
endif ()
add_executable(akonadi_vcarddir_resource ${vcarddirresource_SRCS})
target_link_libraries(akonadi_vcarddir_resource
${KDEPIMLIBS_AKONADI_LIBS}

View file

@ -23,6 +23,8 @@
#include "settingsadaptor.h"
#include "../shared/dirsettingsdialog.h"
#include <KLocale>
#include <QtCore/QDir>
#include <QtCore/QDirIterator>
#include <QtCore/QFile>

View file

@ -1,7 +1,10 @@
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
add_subdirectory( tests )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
set( resourcetester_SRCS
global.cpp
@ -17,7 +20,7 @@ set( resourcetester_SRCS
wrappedobject.cpp
)
kde4_add_executable(resourcetester ${resourcetester_SRCS})
add_executable(resourcetester ${resourcetester_SRCS})
target_link_libraries( resourcetester
${KDEPIMLIBS_AKONADI_XML_LIBS}

View file

@ -12,9 +12,7 @@ qt4_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/dock.h
org.freedesktop.akonaditray.xml )
qt4_add_dbus_adaptor( tray_sources org.freedesktop.akonaditray.xml dock.h Dock )
kde4_add_app_icon(tray_sources "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akonaditray.png")
kde4_add_executable(akonaditray ${tray_sources})
add_executable(akonaditray ${tray_sources})
target_link_libraries(akonaditray ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${AKONADI_COMMON_LIBRARIES} ${KDEPIMLIBS_AKONADI_LIBS})