Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdepimlibs: adjust to recent changes

Browse source
This commit is contained in:
Ivailo Monev 2015-09-23 09:35:50 +00:00
parent 553286be96
commit 273587f5ac
32 changed files with 102 additions and 875 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kdepimlibs/akonadi/CMakeLists.txt
View file

@ -7,11 +7,8 @@ if(CMAKE_COMPILE_GCOV)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
endif()
if (KDE4_BUILD_TESTS)
if (ENABLE_TESTING)
add_subdirectory( tests )
else()
add_subdirectory( tests/testrunner )
add_subdirectory( tests/testresource )
endif()
add_definitions( ${AKONADI_DEFINITIONS} )
@ -249,23 +246,6 @@ qt4_add_dbus_adaptor( akonadikde_LIB_SRC interfaces/org.freedesktop.Akonadi.Agen
kde4_add_kcfg_files( akonadikde_LIB_SRC resourcebasesettings.kcfgc )
install( FILES resourcebase.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
kde4_add_ui_files( akonadikde_LIB_SRC
cachepolicypage.ui
controlprogressindicator.ui
selftestdialog.ui
erroroverlay.ui
)
if (KDEPIM_MOBILE_UI)
kde4_add_ui_files( akonadikde_LIB_SRC
collectiongeneralpropertiespage_mobile.ui
)
else()
kde4_add_ui_files( akonadikde_LIB_SRC
collectiongeneralpropertiespage.ui
)
endif()
add_definitions(
-DAKONADI_DEPRECATED=
)
@ -280,12 +260,12 @@ if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
endif()
generate_export_header(akonadi-kde BASE_NAME akonadi)
if (KDE4_BUILD_TESTS)
if (ENABLE_TESTING)
set(AKONADI_TESTS_EXPORT AKONADI_EXPORT)
endif()
configure_file(akonadiprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadiprivate_export.h")
if (KDE4_BUILD_TESTS)
if (ENABLE_TESTING)
set(AKONADI_TESTS_EXPORT AKONADI_EXPORT)
endif()
configure_file(akonadiprivate_export.h.in
@ -459,10 +439,9 @@ install( FILES
if(QT_QTDESIGNER_FOUND)
message(STATUS "Building Akonadi widgets")
set(akonadiwidgets_PART_SRCS)
kde4_add_widget_files(akonadiwidgets_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/designer/akonadi.widgets)
kde4_add_widget_files(${CMAKE_CURRENT_SOURCE_DIR}/designer/akonadi.widgets)
kde4_add_plugin(akonadiwidgets ${akonadiwidgets_PART_SRCS})
kde4_add_plugin(akonadiwidgets $<TARGET_OBJECTS:akonadi_autowidgets>)
target_link_libraries(akonadiwidgets ${KDE4_KIO_LIBS} akonadi-kde)

1
kdepimlibs/akonadi/calendar/CMakeLists.txt
View file

@ -61,7 +61,6 @@ include_directories(
)
kde4_add_kcfg_files(akonadicalendar_LIB_SRC calendarsettings.kcfgc)
kde4_add_ui_files(akonadicalendar_LIB_SRC publishdialog_base.ui)
qt4_add_dbus_adaptor( akonadicalendar_LIB_SRC ../interfaces/org.freedesktop.Akonadi.Resource.FreeBusyProvider.xml freebusyproviderbase_p.h Akonadi::FreeBusyProviderBasePrivate freebusyprovideradaptor Akonadi__FreeBusyProviderAdaptor )
add_library(akonadi-calendar ${LIBRARY_TYPE} ${akonadicalendar_LIB_SRC})

124
kdepimlibs/akonadi/collectiongeneralpropertiespage_mobile.ui
View file

@ -1,124 +0,0 @@
<ui version="4.0" >
<class>CollectionGeneralPropertiesPage</class>
<widget class="QWidget" name="CollectionGeneralPropertiesPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>&amp;Name:</string>
</property>
<property name="buddy" >
<cstring>nameEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3" >
<widget class="KLineEdit" name="nameEdit" />
</item>
<item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="customIconCheckbox" >
<property name="text" >
<string>&amp;Use custom icon:</string>
</property>
</widget>
</item>
<item row="1" column="3" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="4" >
<widget class="QGroupBox" name="statsBox" >
<property name="title" >
<string>Statistics</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string comment="object names" >Content:</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="countLabel" >
<property name="text" >
<string>0 objects</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Size:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="sizeLabel" >
<property name="text" >
<string>0 Byte</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="2" >
<spacer>
<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>
<customwidgets>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>customIconCheckbox</sender>
<signal>toggled(bool)</signal>
<receiver>customIcon</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>115</x>
<y>55</y>
</hint>
<hint type="destinationlabel" >
<x>245</x>
<y>55</y>
</hint>
</hints>
</connection>
</connections>
</ui>

5
kdepimlibs/akonadi/contact/CMakeLists.txt
View file

@ -17,7 +17,9 @@ endif()
set( AKONADI_PHONE_DIAL_DEFAULT "UseSkype" )
set( AKONADI_SEND_SMS_DEFAULT "UseSkypeSms" )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_subdirectory(kcm)
add_subdirectory(editor/im)
@ -118,7 +120,6 @@ else()
add_definitions(-DDISABLE_EDITOR_WIDGETS)
endif()
qt4_wrap_ui(akonadicontact_LIB_SRC contactgroupeditor.ui)
kde4_add_kcfg_files(akonadicontact_LIB_SRC recentcontactscollectionssettings.kcfgc )
include_directories(
@ -138,7 +139,7 @@ generate_export_header(akonadi-contact
EXPORT_FILE_NAME akonadi-contact_export.h
)
if (KDE4_BUILD_TESTS)
if (ENABLE_TESTING)
set(AKONADI_CONTACT_TESTS_EXPORT AKONADI_CONTACT_EXPORT)
endif()
configure_file(akonadi-contactprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadi-contactprivate_export.h")

2
kdepimlibs/akonadi/kmime/CMakeLists.txt
View file

@ -4,7 +4,9 @@ include_directories(
${Boost_INCLUDE_DIR}
)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ${KDE4_ENABLE_EXCEPTIONS}" )

2
kdepimlibs/akonadi/notes/CMakeLists.txt
View file

@ -38,4 +38,6 @@ install( FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/notes COMPONENT Devel
)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()

2
kdepimlibs/akonadi/socialutils/CMakeLists.txt
View file

@ -5,7 +5,9 @@ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(${QJSON_INCLUDE_DIR})
add_subdirectory(serializer)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
set(akonadi_social_utils_SRCS
socialnetworkattributes.cpp

6
kdepimlibs/akonadi/xml/CMakeLists.txt
View file

@ -2,7 +2,9 @@ if ( LIBXML2_FOUND )
add_definitions( -DHAVE_LIBXML2 )
endif ()
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
include_directories(
${KDE4_INCLUDES}
@ -25,7 +27,7 @@ set( akonadixml_HDRS
xmlwriter.h
)
kde4_add_library(akonadi-xml ${LIBRARY_TYPE} ${akonadixml_SRCS})
add_library(akonadi-xml ${LIBRARY_TYPE} ${akonadixml_SRCS})
generate_export_header(akonadi-xml BASE_NAME akonadi_xml EXPORT_FILE_NAME akonadi-xml_export.h)
target_link_libraries(akonadi-xml
@ -41,7 +43,7 @@ install(TARGETS akonadi-xml EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DE
install(FILES ${akonadixml_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/xml COMPONENT Devel)
install(FILES akonadi-xml.xsd DESTINATION ${DATA_INSTALL_DIR}/akonadi/)
kde4_add_executable(akonadi2xml akonadi2xml.cpp)
add_executable(akonadi2xml akonadi2xml.cpp)
target_link_libraries(akonadi2xml
akonadi-xml
${KDE4_KDEUI_LIBS}

4
kdepimlibs/gpgme++/CMakeLists.txt
View file

@ -49,7 +49,6 @@ set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DI
if ( GPGME_VANILLA_FOUND )
add_library( gpgmepp ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
generate_export_header(gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
target_link_libraries( gpgmepp ${GPGME_VANILLA_LIBRARIES} )
set_target_properties( gpgmepp PROPERTIES
@ -115,9 +114,6 @@ if ( GPGME_PTH_FOUND )
install(TARGETS gpgmepp-pth EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
endif()
# this writes way too much, but do we care?
EXPORT_LIBRARY_DEPENDENCIES( ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake )
########### install files ###############
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GpgmeppConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake @ONLY )

2
kdepimlibs/kabc/CMakeLists.txt
View file

@ -37,7 +37,9 @@ if(NOT KDEPIM_NO_KRESOURCES)
add_subdirectory(formats)
add_subdirectory(plugins)
endif()
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
########### next target ###############

5
kdepimlibs/kabc/vcardparser/CMakeLists.txt
View file

@ -2,6 +2,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/kabc)
if(ENABLE_TESTING)
########### next target ###############
set(testroundtrip_SRCS testroundtrip.cpp)
@ -35,6 +36,7 @@ set(testread2_SRCS testread2.cpp testutils.cpp)
kde4_add_executable(testread2 TEST ${testread2_SRCS})
target_link_libraries(testread2 ${KDE4_KDECORE_LIBS} kabc)
endif()
########### install files ###############
install(
@ -42,5 +44,6 @@ install(
vcard.h
vcardline.h
vcardparser.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc COMPONENT Devel
DESTINATION ${INCLUDE_INSTALL_DIR}/kabc
COMPONENT Devel
)

2
kdepimlibs/kcalcore/CMakeLists.txt
View file

@ -100,7 +100,9 @@ install(TARGETS kcalcore EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAU
########### next target ###############
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
########### install files ###############

4
kdepimlibs/kcalutils/CMakeLists.txt
View file

@ -28,8 +28,6 @@ set(kcalutils_LIB_SRCS
kde4_add_kcfg_files(kcalutils_LIB_SRCS htmlexportsettings.kcfgc)
kde4_add_ui_files(kcalutils_LIB_SRCS recurrenceactionsscopewidget.ui)
add_library(kcalutils ${LIBRARY_TYPE} ${kcalutils_LIB_SRCS})
generate_export_header(kcalutils)
@ -50,7 +48,9 @@ install(TARGETS kcalutils EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFA
########### next target ###############
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
########### install files ###############

13
kdepimlibs/kholidays/CMakeLists.txt
View file

@ -6,7 +6,9 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5350)
add_subdirectory(holidays)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/parsers/plan2)
@ -30,12 +32,6 @@ set(kholidays_LIB_SRCS
parsers/plan2/holidayparserplan.cpp
)
set(kholidays_UI
holidayregionselector.ui
)
kde4_add_ui_files(kholidays_LIB_SRCS ${kholidays_UI})
add_library(kholidays ${LIBRARY_TYPE} ${kholidays_LIB_SRCS})
generate_export_header(kholidays)
@ -51,10 +47,9 @@ install(TARGETS kholidays EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFA
########### next target ###############
if(QT_QTDESIGNER_FOUND)
set(kholidayswidgets_PART_SRCS)
kde4_add_widget_files(kholidayswidgets_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/kholidays.widgets)
kde4_add_widget_files(${CMAKE_CURRENT_SOURCE_DIR}/kholidays.widgets)
kde4_add_plugin(kholidayswidgets ${kholidayswidgets_PART_SRCS})
kde4_add_plugin(kholidayswidgets $<TARGET_OBJECTS:kholidays_autowidgets>)
target_link_libraries(kholidayswidgets ${KDE4_KIO_LIBS} kholidays)

2
kdepimlibs/kimap/CMakeLists.txt
View file

@ -2,7 +2,9 @@ project(kimap)
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5327 )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )

4
kdepimlibs/kioslave/smtp/CMakeLists.txt
View file

@ -1,6 +1,6 @@
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")

2
kdepimlibs/kldap/CMakeLists.txt
View file

@ -38,7 +38,9 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kldap_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kldap_config.h)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
########### next target ###############

2
kdepimlibs/kmbox/CMakeLists.txt
View file

@ -9,7 +9,9 @@ set(kmbox_LIB_SRCS
mbox.cpp
)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_library(kmbox ${LIBRARY_TYPE} ${kmbox_LIB_SRCS})
generate_export_header(kmbox)

2
kdepimlibs/kmime/CMakeLists.txt
View file

@ -1,4 +1,6 @@
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5320 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII )
include(CheckTimezone)
configure_file (config-kmime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmime.h)

2
kdepimlibs/kpimidentities/CMakeLists.txt
View file

@ -4,7 +4,9 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
set(kpimidentities_LIB_SRCS identitymanager.cpp identity.cpp signature.cpp signatureconfigurator.cpp identitycombo.cpp)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
qt4_add_dbus_adaptor(kpimidentities_LIB_SRCS org.kde.pim.IdentityManager.xml identitymanager.h KPIMIdentities::IdentityManager )

2
kdepimlibs/kpimtextedit/CMakeLists.txt
View file

@ -36,7 +36,9 @@ target_link_libraries(kpimtextedit
kmime
)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
set_target_properties(kpimtextedit PROPERTIES
VERSION ${GENERIC_LIB_VERSION}

2
kdepimlibs/kpimutils/CMakeLists.txt
View file

@ -4,7 +4,9 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5321)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
include_directories(
../kmime

2
kdepimlibs/kresources/CMakeLists.txt
View file

@ -1,6 +1,8 @@
project(kresources)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
include_directories(${KDE4_KIO_INCLUDES})

2
kdepimlibs/ktnef/CMakeLists.txt
View file

@ -2,7 +2,9 @@ project(ktnef)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5975)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
########### next target ###############

2
kdepimlibs/kxmlrpcclient/CMakeLists.txt
View file

@ -1,6 +1,8 @@
project(kxmlrpcclient)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
########### next target ###############

14
kdepimlibs/mailtransport/CMakeLists.txt
View file

@ -9,8 +9,9 @@ include_directories(
option(MAILTRANSPORT_INPROCESS_SMTP "false" "Use in-process SMTP instead of KIO slaves (note that this changes the mailtransport license from LGPL to GPL!)")
add_subdirectory(kconf_update)
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5324)
@ -76,17 +77,6 @@ set(mailtransport_lib_srcs
addtransportdialog.cpp
)
kde4_add_ui_files(mailtransport_lib_srcs
sendmailsettings.ui
addtransportdialog.ui
transportmanagementwidget.ui
)
if(KDEPIM_MOBILE_UI)
kde4_add_ui_files(mailtransport_lib_srcs smtpsettings_mobile.ui)
else()
kde4_add_ui_files(mailtransport_lib_srcs smtpsettings_desktop.ui)
endif()
kde4_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc)
add_library(mailtransport ${LIBRARY_TYPE} ${mailtransport_lib_srcs})

2
kdepimlibs/mailtransport/kconf_update/CMakeLists.txt
View file

@ -1,2 +0,0 @@
install(FILES mailtransports.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
install(PROGRAMS migrate-transports.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})

11
kdepimlibs/mailtransport/kconf_update/mailtransports.upd
View file

@ -1,11 +0,0 @@
# Migrate kmail's transport settings
Id=initial-kmail-migration
File=kmailrc,mailtransports
ScriptArguments=kmail
Script=migrate-transports.pl,perl
# Migrate knode's mailserver settings
Id=initial-knode-migration
File=knoderc,mailtransports
ScriptArguments=knode
Script=migrate-transports.pl,perl

73
kdepimlibs/mailtransport/kconf_update/migrate-transports.pl
View file

@ -1,73 +0,0 @@
#!/usr/bin/perl
#
# Copyright (c) 2006 Volker Krause <vkrause@kde.org>
# based on kmail-3.3-move-identities.pl by David Faure <faure@kde.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
#
$currentGroup = "";
$source = $ARGV[0];
%kmail_key_map = ( "pass", "password-kmail" );
%knode_key_map = (
"server", "host",
"needsLogon", "auth",
"timeout", "",
"holdTime", "",
"pass", "password-knode"
);
while (<STDIN>) {
next if /^$/;
# recognize groups:
if ( /^\[(.+)\]$/ ) {
$currentGroup = $1;
if ( $source eq "kmail" && $currentGroup =~ /^Transport/ ) {
# keep the old settings so that KMail from KDE 3 still works
#print "# DELETEGROUP [$currentGroup]\n";
$groupid = $currentGroup;
$groupid =~ s/^Transport //;
print "[Transport kmail-$groupid]\n";
}
elsif ( $source eq "knode" && $currentGroup eq "MAILSERVER" ) {
# keep the old settings so that KNode from KDE 3 still works
#print "# DELETEGROUP [$currentGroup]\n";
print "[Transport knode-0]\n";
print "name=KNode Mail Transport\n";
}
next;
};
($key,$value) = split /=/;
chomp $value;
# Move over keys from the transport groups
if ( $source eq "kmail" && $currentGroup =~ /^Transport/ ) {
$key = $kmail_key_map{$key} if exists $kmail_key_map{$key};
if ( $key eq "authtype" ) {
$value =~ s/-/_/g;
}
print "$key=$value\n";
}
elsif ( $source eq "knode" && $currentGroup eq "MAILSERVER" ) {
$key = $knode_key_map{$key} if exists $knode_key_map{$key};
next if $key eq "";
print "$key=$value\n";
}
# Move over the key for the default transport
elsif ( $source eq "kmail" && $currentGroup eq 'Composer' ) {
if ( $key eq 'default-transport' ) {
print "[General]\n$key=$value\n";
#print "# DELETE [$currentGroup]$key\n";
}
}
}

548
kdepimlibs/mailtransport/smtpsettings_mobile.ui
View file

@ -1,548 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Volker Krause &lt;vkrause@kde.org&gt;, KovoKs &lt;tomalbers@kde.nl&gt;</author>
<class>SMTPSettings</class>
<widget class="QWidget" name="SMTPSettings">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>855</width>
<height>808</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>855</width>
<height>808</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Account Information</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="hostLabel">
<property name="text">
<string>Mail &amp;server:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>kcfg_host</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KLineEdit" name="kcfg_host"/>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_requiresAuthentication">
<property name="text">
<string>Server &amp;requires authentication</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="usernameLabel">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Login:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>kcfg_userName</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="KLineEdit" name="kcfg_userName">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>P&amp;assword:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>password</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="KLineEdit" name="password">
<property name="enabled">
<bool>false</bool>
</property>
<property name="whatsThis">
<string>The password to send to the server for authorization.</string>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="kcfg_storePassword">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Store SMTP password</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="KButtonGroup" name="kcfg_encryption">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Connection Settings</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QStackedWidget" name="checkCapabilitiesStack">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="KPushButton" name="checkCapabilities">
<property name="text">
<string>Auto Detect</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QProgressBar" name="checkCapabilitiesProgress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QLabel" name="noAuthPossible">
<property name="visible">
<bool>false</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="text">
<string>This server does not support authentication</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Encryption:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="encryptHLayout">
<item>
<widget class="QRadioButton" name="none">
<property name="text">
<string>&amp;None</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="ssl">
<property name="text">
<string>&amp;SSL</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="tls">
<property name="text">
<string>&amp;TLS</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>&amp;Port:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>kcfg_port</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KIntNumInput" name="kcfg_port">
<property name="value">
<number>25</number>
</property>
<property name="minimum">
<number>1</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="authLabel">
<property name="text">
<string>Authentication:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="KComboBox" name="authCombo"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="smtpSettingsGroupBox">
<property name="title">
<string>SMTP Settings</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_specifyHostname">
<property name="text">
<string>Sen&amp;d custom hostname to server</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="hostnameLabel">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Hos&amp;tname:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>kcfg_localHostname</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KLineEdit" name="kcfg_localHostname">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_specifySenderOverwriteAddress">
<property name="text">
<string>Use custom sender address</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Sender Address:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="KLineEdit" name="kcfg_senderOverwriteAddress">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="precommandLabel">
<property name="text">
<string>Precommand:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="KLineEdit" name="kcfg_precommand"/>
</item>
</layout>
</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>KButtonGroup</class>
<extends>QGroupBox</extends>
<header>kbuttongroup.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>kcfg_specifyHostname</sender>
<signal>toggled(bool)</signal>
<receiver>hostnameLabel</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>101</x>
<y>249</y>
</hint>
<hint type="destinationlabel">
<x>83</x>
<y>277</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_specifyHostname</sender>
<signal>toggled(bool)</signal>
<receiver>kcfg_localHostname</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>196</x>
<y>249</y>
</hint>
<hint type="destinationlabel">
<x>199</x>
<y>277</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_requiresAuthentication</sender>
<signal>toggled(bool)</signal>
<receiver>kcfg_userName</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>372</x>
<y>110</y>
</hint>
<hint type="destinationlabel">
<x>372</x>
<y>137</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_requiresAuthentication</sender>
<signal>toggled(bool)</signal>
<receiver>usernameLabel</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>372</x>
<y>110</y>
</hint>
<hint type="destinationlabel">
<x>141</x>
<y>137</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_requiresAuthentication</sender>
<signal>toggled(bool)</signal>
<receiver>passwordLabel</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>372</x>
<y>110</y>
</hint>
<hint type="destinationlabel">
<x>128</x>
<y>164</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_requiresAuthentication</sender>
<signal>toggled(bool)</signal>
<receiver>password</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>372</x>
<y>110</y>
</hint>
<hint type="destinationlabel">
<x>372</x>
<y>164</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_requiresAuthentication</sender>
<signal>toggled(bool)</signal>
<receiver>kcfg_storePassword</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>372</x>
<y>110</y>
</hint>
<hint type="destinationlabel">
<x>372</x>
<y>189</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_specifySenderOverwriteAddress</sender>
<signal>toggled(bool)</signal>
<receiver>label_2</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>59</x>
<y>299</y>
</hint>
<hint type="destinationlabel">
<x>78</x>
<y>312</y>
</hint>
</hints>
</connection>
<connection>
<sender>kcfg_specifySenderOverwriteAddress</sender>
<signal>toggled(bool)</signal>
<receiver>kcfg_senderOverwriteAddress</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>152</x>
<y>297</y>
</hint>
<hint type="destinationlabel">
<x>169</x>
<y>318</y>
</hint>
</hints>
</connection>
</connections>
</ui>

14
kdepimlibs/qgpgme/CMakeLists.txt
View file

@ -4,18 +4,7 @@ set( _any_gpgme_found false )
set( _qgpgme_version 1.0.1 )
set( _qgpgme_soversion 1 )
if ( WIN32 AND GPGME_VANILLA_FOUND )
# on Windows, we require gpgme(-vanilla), which is thread-safe,
# and we don't provide gpgme-qt support
set( _any_gpgme_found true )
set( _qgpgme_libgpgme gpgmepp )
#set( _qgpgme_extra_src eventloopinteractor_win.cpp )
endif()
if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
if ( GPGME_PTHREAD_FOUND )
# on Unix, we requrie gpgme-pthread (for convenience, since vanilla
# gpgme isn't thread-aware, and we don't want to restrict clients
@ -44,7 +33,6 @@ if ( _any_gpgme_found )
)
add_library( qgpgme ${LIBRARY_TYPE} ${qgpgme_LIB_SRCS} )
generate_export_header(qgpgme)
target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )

2
kdepimlibs/syndication/CMakeLists.txt
View file

@ -1,7 +1,9 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
if(ENABLE_TESTING)
add_subdirectory(tests)
endif()
add_subdirectory( atom )
add_subdirectory( rdf )