diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index cbaa90df5..b9d1f31a3 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -1,208 +1,216 @@
 project(akonadi-kde)
 
 if (KDE4_BUILD_TESTS)
    # only with this macro the AKONADI_TESTS_EXPORT macro will do something
    add_definitions(-DCOMPILING_TESTS)
 endif (KDE4_BUILD_TESTS)
 
 add_subdirectory( kabc )
 add_subdirectory( kmime )
 add_subdirectory( tests )
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${QT_QTDBUS_INCLUDE_DIR}
   ${Boost_INCLUDE_DIR}
   ${KDE4_INCLUDE_DIR}
   ${AKONADI_INCLUDE_DIR}
   ${AKONADI_INCLUDE_DIR}/akonadi/private
 )
 
 # libakonadi-kde
 
 set( akonadikde_LIB_SRC
   entity.cpp # keep it at top to not break enable-final
   agentbase.cpp
   agentfilterproxymodel.cpp
   agentinstance.cpp
   agentinstancecreatejob.cpp
   agentinstancemodel.cpp
   agentinstancewidget.cpp
   agentmanager.cpp
   agenttype.cpp
   agenttypemodel.cpp
   agenttypewidget.cpp
   agenttypedialog.cpp
   attribute.cpp
   attributefactory.cpp
   cachepolicy.cpp
   cachepolicypage.cpp
   changerecorder.cpp
   collection.cpp
   collectioncopyjob.cpp
   collectioncreatejob.cpp
   collectiondeletejob.cpp
   collectionfilterproxymodel.cpp
   collectiongeneralpropertiespage.cpp
   collectionfetchjob.cpp
   collectionmodel.cpp
   collectionmodel_p.cpp
   collectionmodifyjob.cpp
   collectionpathresolver.cpp
   collectionpropertiesdialog.cpp
   collectionpropertiespage.cpp
   collectionrightsattribute.cpp
   collectionselectjob.cpp
   collectionstatistics.cpp
   collectionstatisticsdelegate.cpp
   collectionstatisticsjob.cpp
   collectionstatisticsmodel.cpp
   collectionsync.cpp
   collectionview.cpp
   control.cpp
   entitydisplayattribute.cpp
   #entitysortfilterproxymodel.cpp
   erroroverlay.cpp
   expungejob.cpp
   flatcollectionproxymodel.cpp
   item.cpp
   itemcreatejob.cpp
   itemcopyjob.cpp
   itemdeletejob.cpp
   itemfetchjob.cpp
   itemfetchscope.cpp
   itemmodel.cpp
   itemmonitor.cpp
   itemmovejob.cpp
   itemserializer.cpp
   itemserializerplugin.cpp
   itemmodifyjob.cpp
   itemsync.cpp
   itemview.cpp
   job.cpp
   linkjob.cpp
   monitor.cpp
   monitor_p.cpp
   pastehelper.cpp
   protocolhelper.cpp
   resourcebase.cpp
   resourcescheduler.cpp
   searchcreatejob.cpp
   selftestdialog.cpp
   session.cpp
   servermanager.cpp
   standardactionmanager.cpp
   subscriptionjob.cpp
   subscriptionchangeproxymodel.cpp
   subscriptiondialog.cpp
   subscriptionmodel.cpp
   transactionjobs.cpp
   transactionsequence.cpp
   unlinkjob.cpp
 # Temporary until ported to Qt-plugin framework
   pluginloader.cpp
 )
 
 # DBus interfaces and adaptors
 set(akonadi_xml ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.NotificationManager.xml)
 set_source_files_properties(${akonadi_xml} PROPERTIES INCLUDE "notificationmessage_p.h")
 qt4_add_dbus_interface( akonadikde_LIB_SRC ${akonadi_xml} notificationmanagerinterface )
 qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.AgentManager.xml )
 qt4_add_dbus_interfaces( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Tracer.xml )
 qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Resource.xml resourcebase.h Akonadi::ResourceBase )
 qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Status.xml agentbase.h Akonadi::AgentBase )
 qt4_add_dbus_adaptor( akonadikde_LIB_SRC ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Control.xml agentbase.h Akonadi::AgentBase )
 
 kde4_add_ui_files( akonadikde_LIB_SRC
   cachepolicypage.ui
   collectiongeneralpropertiespage.ui
   subscriptiondialog.ui
   controlprogressindicator.ui
   selftestdialog.ui
 )
 
 kde4_add_library( akonadi-kde SHARED ${akonadikde_LIB_SRC} )
 
+macro_ensure_version( "4.2.0" ${KDEVERSION} KDE_IS_AT_LEAST_42 )
+
 target_link_libraries( akonadi-kde ${KDE4_SOLID_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${AKONADI_COMMON_LIBRARIES} )
-target_link_libraries( akonadi-kde LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
+set( AKONADI_KDE_DEPS ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
+
+if(${KDE_IS_AT_LEAST_42})
+target_link_libraries( akonadi-kde LINK_INTERFACE_LIBRARIES ${AKONADI_KDE_DEPS})
+else(${KDE_IS_AT_LEAST_42})
+target_link_libraries( akonadi-kde ${AKONADI_KDE_DEPS})
+endif(${KDE_IS_AT_LEAST_42})
 
 
 set_target_properties( akonadi-kde PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install( TARGETS akonadi-kde EXPORT kdepimlibsLibraryTargets  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### install files ###############
 
 install( FILES
   akonadi_export.h
   agentbase.h
   agentfilterproxymodel.h
   agentinstance.h
   agentinstancecreatejob.h
   agentinstancemodel.h
   agentinstancewidget.h
   agentmanager.h
   agenttype.h
   agenttypemodel.h
   agenttypewidget.h
   agenttypedialog.h
   attribute.h
   attributefactory.h
   cachepolicy.h
   changerecorder.h
   collection.h
   collectioncopyjob.h
   collectioncreatejob.h
   collectiondeletejob.h
   collectionfilterproxymodel.h
   collectionfetchjob.h
   collectionmodel.h
   collectionmodifyjob.h
   collectionpropertiesdialog.h
   collectionpropertiespage.h
   collectionstatisticsdelegate.h
   collectionstatisticsmodel.h
   collectionstatistics.h
   collectionstatisticsjob.h
   collectionview.h
   control.h
   entity.h
   entitydisplayattribute.h
   #  entitysortfilterproxymodel.h
   item.h
   itemcreatejob.h
   itemcopyjob.h
   itemdeletejob.h
   itemfetchjob.h
   itemfetchscope.h
   itemmodel.h
   itemmodifyjob.h
   itemmonitor.h
   itemmovejob.h
   itempayloadinternals_p.h
   itemserializerplugin.h
   itemsync.h
   itemview.h
   job.h
   linkjob.h
   monitor.h
   resourcebase.h
   searchcreatejob.h
   session.h
   servermanager.h
   standardactionmanager.h
   transactionjobs.h
   transactionsequence.h
   unlinkjob.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi COMPONENT Devel
 )
 
 install( FILES
    collectionpathresolver_p.h
    DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/private COMPONENT Devel
    )
 
 install( FILES
   kcfg2dbus.xsl
   DESTINATION ${DATA_INSTALL_DIR}/akonadi-kde
 )
diff --git a/akonadi/agenttypedialog.cpp b/akonadi/agenttypedialog.cpp
index b1ceb0518..1d29e05a2 100644
--- a/akonadi/agenttypedialog.cpp
+++ b/akonadi/agenttypedialog.cpp
@@ -1,83 +1,88 @@
 /*
     Copyright (c) 2006 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2008 Omat Holding B.V. <info@omat.nl>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "agenttypedialog.h"
 #include "agentfilterproxymodel.h"
 
 #include <QObject>
 #include <QtGui/QVBoxLayout>
 
+#include <kdeversion.h>
+
+#if KDE_IS_VERSION(4,2,0 )
 #include <kfilterproxysearchline.h>
+#endif
 
 using namespace Akonadi;
 
 
 class AgentTypeDialog::Private
 {
   public:
     AgentTypeWidget *Widget;
     AgentType agentType;
 };
 
 AgentTypeDialog::AgentTypeDialog( QWidget *parent )
       : KDialog( parent ), d( new Private )
 {
   setButtons( Ok | Cancel );
   QVBoxLayout *layout = new QVBoxLayout( mainWidget() );
 
-  KFilterProxySearchLine* searchLine = new KFilterProxySearchLine( mainWidget() );
-  layout->addWidget( searchLine );
-
   d->Widget = new Akonadi::AgentTypeWidget( mainWidget() );
   connect( d->Widget, SIGNAL( activated() ), this, SLOT( accept() ) );
 
+#if KDE_IS_VERSION(4,2,0 )
+  KFilterProxySearchLine* searchLine = new KFilterProxySearchLine( mainWidget() );
+  layout->addWidget( searchLine );
   searchLine->setProxy( d->Widget->agentFilterProxyModel() );
+#endif
 
   layout->addWidget( d->Widget );
 
   connect( this, SIGNAL( okClicked() ), this, SLOT( accept() ) );
 
   resize( 460, 320 );
 }
 
 AgentTypeDialog::~AgentTypeDialog()
 {
   delete d;
 }
 
 void AgentTypeDialog::done( int result )
 {
   if ( result == Accepted )
     d->agentType = d->Widget->currentAgentType();
   else
     d->agentType = AgentType();
 
   KDialog::done( result );
 }
 
 AgentType AgentTypeDialog::agentType() const
 {
   return d->agentType;
 }
 
 AgentFilterProxyModel* AgentTypeDialog::agentFilterProxyModel() const
 {
   return d->Widget->agentFilterProxyModel();
 }
 
 #include "agenttypedialog.moc"