Complete the removal of Windows CE 5 support in kdepim.

It's unmaintained and already gone from Akonadi, KF5, kdepimlibs,
kdepim-runtime and Kontact Touch. So, pointless to keep it here.
wilder-work
Volker Krause 12 years ago
parent cc13b177c0
commit d835756406
  1. 24
      CMakeLists.txt
  2. 4
      identity/identitydialog.cpp
  3. 11
      kcm_kpimidentities/CMakeLists.txt

@ -6,20 +6,16 @@ add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
if (NOT WINCE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
qt4_generate_dbus_interface(kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt4_generate_dbus_interface(editor/kmcomposewin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
qt4_generate_dbus_interface(kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt4_generate_dbus_interface(editor/kmcomposewin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
add_custom_target(kmail_xml ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.mailcomposer.xml
COMMENT "Helper target for XML stuff. The Kontact plugin, KOrganizer and others depend on it."
)
endif ()
add_custom_target(kmail_xml ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.mailcomposer.xml
COMMENT "Helper target for XML stuff. The Kontact plugin, KOrganizer and others depend on it."
)
include_directories(
${CMAKE_SOURCE_DIR}/libkdepim
@ -55,7 +51,7 @@ include_directories(
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
if (KDEPIM_BUILD_DESKTOP)
add_subdirectory(about)
add_subdirectory(pics)
add_subdirectory(icons)
@ -67,7 +63,7 @@ add_subdirectory(kcm_kpimidentities)
########### kmailprivate ###############
if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
if (KDEPIM_BUILD_DESKTOP)
set(kmailprivate_LIB_SRCS
widgets/collectionpane.cpp

@ -118,10 +118,6 @@ IdentityDialog::IdentityDialog( QWidget * parent )
#endif
setDefaultButton( Ok );
#ifdef Q_OS_WINCE
setWindowState( Qt::WindowFullScreen );
#endif
// tmp. vars:
QWidget * tab;
QLabel * label;

@ -11,20 +11,11 @@ set(kcm_identities_srcs
../identity/newidentitydialog.cpp
../identity/identityeditvcarddialog.cpp
../identity/identityaddvcarddialog.cpp
)
if (NOT WINCE)
set(kcm_identities_srcs
${kcm_identities_srcs}
../identity/xfaceconfigurator.cpp
)
endif()
kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
if (WINCE)
kde4_add_plugin(kcm_kpimidentities STATIC ${kcm_identities_srcs})
else()
kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
endif()
kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
target_link_libraries(kcm_kpimidentities
${KDEPIMLIBS_GPGMEPP_LIBS}
${KDEPIMLIBS_AKONADI_LIBS}

Loading…
Cancel
Save