diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 0e2d252a..99e433bf 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,126 +1,130 @@
 if(POLICY CMP0028)
   cmake_policy(SET CMP0028 OLD)
 endif()
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 
 include(ECMAddTests)
 
 add_subdirectory(http)
 add_subdirectory(kcookiejar)
 
 find_package(Qt5Widgets REQUIRED)
 
 ########### unittests ###############
 
 find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 
 ecm_add_tests(
  kacltest.cpp
  listdirtest.cpp
  kmountpointtest.cpp
  upurltest.cpp
  dataprotocoltest.cpp
  jobtest.cpp
  jobremotetest.cpp
  kfileitemtest.cpp
  kprotocolinfotest.cpp
  ktcpsockettest.cpp
  globaltest.cpp
  mkpathjobtest.cpp
  threadtest.cpp
  udsentrytest.cpp
  udsentry_benchmark.cpp
  deletejobtest.cpp
  NAME_PREFIX "kiocore-"
  LINK_LIBRARIES KF5::KIOCore KF5::I18n Qt5::Test Qt5::Network
 )
 
 target_link_libraries(threadtest Qt5::Concurrent)
 
 ecm_add_test(
     http_jobtest.cpp
     httpserver_p.cpp
     TEST_NAME http_jobtest
     NAME_PREFIX "kiocore-"
     LINK_LIBRARIES KF5::KIOCore KF5::I18n Qt5::Test Qt5::Network
 )
 
 if(UNIX)
   ecm_add_tests(
     klocalsockettest.cpp
     klocalsocketservertest.cpp
     NAME_PREFIX "kiocore-"
     LINK_LIBRARIES KF5::KIOCore KF5::I18n Qt5::Test Qt5::Network
   )
 endif()
 
 if (TARGET KF5::KIOGui)
   ecm_add_tests(
     favicontest.cpp
     NAME_PREFIX "kiogui-"
     LINK_LIBRARIES KF5::KIOCore KF5::KIOGui Qt5::Test
   )
 
   target_link_libraries(favicontest Qt5::Concurrent)
 endif()
 
 if (TARGET KF5::KIOWidgets)
 ecm_add_tests(
  clipboardupdatertest.cpp
  dropjobtest.cpp
  kdynamicjobtrackernowidgetstest.cpp
  krununittest.cpp
  kdirlistertest.cpp
  kdirmodeltest.cpp
  kfileitemactionstest.cpp
  fileundomanagertest.cpp
  kurifiltertest.cpp
  kurlcompletiontest.cpp
  jobguitest.cpp
  pastetest.cpp
  accessmanagertest.cpp
  kurifiltersearchprovideractionstest.cpp
  NAME_PREFIX "kiowidgets-"
  LINK_LIBRARIES KF5::KIOCore KF5::KIOWidgets Qt5::Test
 )
 set_target_properties(krununittest PROPERTIES COMPILE_FLAGS "-DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\\\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\\\"")
 
 # Same as accessmanagertest, but using QNetworkAccessManager, to make sure we
 # behave the same
 ecm_add_test(
  accessmanagertest.cpp
  TEST_NAME accessmanagertest-qnam
  NAME_PREFIX "kiowidgets-"
  LINK_LIBRARIES KF5::KIOCore KF5::KIOWidgets Qt5::Test
 )
 set_target_properties(accessmanagertest-qnam PROPERTIES COMPILE_FLAGS "-DUSE_QNAM")
 
 # Same as kurlcompletiontest, but with immediate return, and results posted by thread later
 ecm_add_test(
  kurlcompletiontest.cpp
  TEST_NAME kurlcompletiontest-nowait
  NAME_PREFIX "kiowidgets-"
  LINK_LIBRARIES KF5::KIOCore KF5::KIOWidgets Qt5::Test
  )
 set_target_properties(kurlcompletiontest-nowait PROPERTIES COMPILE_FLAGS "-DNO_WAIT")
 
 
 endif()
 
 if (TARGET KF5::KIOFileWidgets)
 find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
 include_directories(${CMAKE_SOURCE_DIR}/src/filewidgets ${CMAKE_BINARY_DIR}/src/filewidgets)
 ecm_add_tests(
  kurlnavigatortest.cpp
  kurlcomboboxtest.cpp
  kdiroperatortest.cpp
  kfilewidgettest.cpp
  knewfilemenutest.cpp
  kfilecopytomenutest.cpp
  kfileplacesmodeltest.cpp
  kurlrequestertest.cpp
  NAME_PREFIX "kiofilewidgets-"
  LINK_LIBRARIES KF5::KIOFileWidgets KF5::KIOWidgets KF5::XmlGui KF5::Bookmarks Qt5::Test KF5::I18n
 )
 endif()
 
+# this should be done by cmake, see bug 371721
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set_property(TARGET jobtest APPEND PROPERTY AUTOMOC_MOC_OPTIONS --include ${CMAKE_BINARY_DIR}/src/core/moc_predefs.h)
+endif()
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 4da557ef..559c14d9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,273 +1,283 @@
 project(KIOCore)
 
 include (ConfigureChecks.cmake)
 
 configure_file(config-kiocore.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kiocore.h )
 
 configure_file(config-kmountpoint.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmountpoint.h)
 
 # KSSL_HAVE_SSL only used in kssl/ksslsettings.cpp, but currently ifdefed out
 #find_package(OpenSSL)
 #set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure network communications (SSL and TLS)"
 #                       URL "http://openssl.org"
 #                       TYPE RECOMMENDED
 #                       PURPOSE "KDE uses OpenSSL for the bulk of secure communications, including secure web browsing via HTTPS"
 #                      )
 #if(OPENSSL_FOUND)
 #   set(KSSL_HAVE_SSL 1)
 #   include_directories(${OPENSSL_INCLUDE_DIR})
 #endif()
 
 set(kiocore_SRCS
   idleslave.cpp
   klocalsocket.cpp
   connectionbackend.cpp
   connection.cpp
   connectionserver.cpp
   krecentdocument.cpp
   kfileitemlistproperties.cpp
   tcpslavebase.cpp
   directorysizejob.cpp
   forwardingslavebase.cpp
   chmodjob.cpp
   kdiskfreespaceinfo.cpp
   usernotificationhandler.cpp
   ksambasharedata.cpp
   ksambashare.cpp
   knfsshare.cpp
   kfileitem.cpp
   davjob.cpp
   deletejob.cpp
   copyjob.cpp
   filejob.cpp
   mkdirjob.cpp
   mkpathjob.cpp
   kpasswdserverloop.cpp
   kpasswdserverclient.cpp
   kremoteencoding.cpp
   sessiondata.cpp
   slavebase.cpp
   dataslave.cpp
   dataprotocol.cpp
   desktopexecparser.cpp
   emptytrashjob.cpp
   authinfo.cpp
   slaveinterface.cpp
   slave.cpp
   job_error.cpp
   job.cpp
   filecopyjob.cpp
   listjob.cpp
   mimetypejob.cpp
   multigetjob.cpp
   restorejob.cpp
   simplejob.cpp
   specialjob.cpp
   statjob.cpp
   storedtransferjob.cpp
   transferjob.cpp
   filesystemfreespacejob.cpp
   scheduler.cpp
   slaveconfig.cpp
   kprotocolmanager.cpp
   hostinfo.cpp
   kdirnotify.cpp
   kurlauthorized.cpp
   kacl.cpp
   udsentry.cpp
   global.cpp
   metadata.cpp
   kprotocolinfo.cpp
   kprotocolinfofactory.cpp
   jobtracker.cpp
   jobuidelegateextension.cpp
   jobuidelegatefactory.cpp
   kmountpoint.cpp
   kcoredirlister.cpp
   faviconscache.cpp
 
   ksslcertificatemanager.cpp
   ktcpsocket.cpp
   kssl/ksslsettings.cpp
 
   kiocoredebug.cpp
 
   kioglobal_p.cpp
 )
 
 if (UNIX)
    set(kiocore_SRCS ${kiocore_SRCS}
       klocalsocket_unix.cpp
       kioglobal_p_unix.cpp
    )
 endif()
 if (WIN32)
    set(kiocore_SRCS ${kiocore_SRCS}
       klocalsocket_win.cpp
       kioglobal_p_win.cpp
    )
 endif()
 
 qt5_add_dbus_interface(kiocore_SRCS org.kde.KSlaveLauncher.xml klauncher_interface)
 
 set_source_files_properties(org.kde.KPasswdServer.xml
         PROPERTIES INCLUDE authinfo.h
 )
 qt5_add_dbus_interface(kiocore_SRCS org.kde.KPasswdServer.xml kpasswdserver_interface)
 install(FILES
    org.kde.KDirNotify.xml
    DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
    RENAME kf5_org.kde.KDirNotify.xml)
 install(FILES
    org.kde.KPasswdServer.xml
    DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
    RENAME kf5_org.kde.KPasswdServer.xml)
 install(FILES
    org.kde.KSlaveLauncher.xml
    DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
    RENAME kf5_org.kde.KSlaveLauncher.xml)
 
 add_library(KF5KIOCore ${kiocore_SRCS})
 generate_export_header(KF5KIOCore BASE_NAME KIOCore)
 add_library(KF5::KIOCore ALIAS KF5KIOCore)
 
 target_include_directories(KF5KIOCore PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>" # kio_version.h
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/kssl>"
 )
 
 target_include_directories(KF5KIOCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIOCore>")
 
 target_link_libraries(KF5KIOCore
 PUBLIC
  KF5::CoreAddons   # KJob
  KF5::Service
 PRIVATE
  Qt5::Network
  Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp
  Qt5::Xml                   # davjob.cpp uses QDom
  Qt5::DBus
  KF5::I18n
  KF5::DBusAddons            # KDEInitInterface
 )
 
 if(ACL_FOUND)
   target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
 endif()
 
 set_target_properties(KF5KIOCore PROPERTIES VERSION ${KIO_VERSION_STRING}
                                             SOVERSION ${KIO_SOVERSION}
                                             EXPORT_NAME KIOCore
 )
 
+# this should be done by cmake, see bug 371721
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h
+        COMMAND "${CMAKE_CXX_COMPILER}" "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp" > ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h
+    )
+    set_property(TARGET KF5KIOCore APPEND PROPERTY AUTOMOC_MOC_OPTIONS --include ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h)
+    set_property(TARGET KF5KIOCore APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h)
+endif()
+
 # Headers prefixed with KIO/
 ecm_generate_headers(KIOCore_CamelCase_HEADERS
   HEADER_NAMES
   IdleSlave
   ConnectionServer
   TCPSlaveBase
   DirectorySizeJob
   ForwardingSlaveBase
   Job #     ### should forward to job_base.h, not job.h...
   JobTracker
   Global
   ChmodJob
   DeleteJob
   CopyJob
   EmptyTrashJob
   FileJob
   MkdirJob
   MkpathJob
   SlaveBase
   SlaveConfig
   HostInfo
   MetaData
   UDSEntry
   JobUiDelegateExtension
   JobUiDelegateFactory
   SlaveInterface
   Slave
   FileCopyJob
   ListJob
   MimetypeJob
   MultiGetJob
   RestoreJob
   SimpleJob
   SpecialJob
   StatJob
   StoredTransferJob
   TransferJob
   Scheduler
   AuthInfo
   DavJob
   DesktopExecParser
   FileSystemFreeSpaceJob
 
   PREFIX KIO
   REQUIRED_HEADERS KIO_namespaced_HEADERS
 )
 
 # Create local forwarding header for kio/job_base.h
 set(REGULAR_HEADER_NAME ${CMAKE_CURRENT_BINARY_DIR}/kio/job_base.h)
 if (NOT EXISTS ${REGULAR_HEADER_NAME})
    file(WRITE ${REGULAR_HEADER_NAME} "#include \"${CMAKE_CURRENT_SOURCE_DIR}/job_base.h\"\n")
 endif()
 
 
 install(TARGETS KF5KIOCore EXPORT KF5KIOTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
   http_slave_defaults.h
   ioslave_defaults.h
   job_base.h
   jobclasses.h
 
   ${KIO_namespaced_HEADERS}
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KIOCore/kio COMPONENT Devel
 )
 
 # Headers not prefixed with KIO/
 ecm_generate_headers(KIOCore_HEADERS
   HEADER_NAMES
   KACL
   KUrlAuthorized
   KCoreDirLister
   KRemoteEncoding
   KDirNotify
   KDiskFreeSpaceInfo
   KFileItem
   KFileItemListProperties
   KMountPoint
   KNFSShare
   KSambaShare
   KSambaShareData
   KPasswdServerClient
   KProtocolInfo
   KProtocolManager
   KRecentDocument
   KSslCertificateManager
   KTcpSocket
 
   REQUIRED_HEADERS KIOCore_HEADERS
 )
 
 ecm_generate_headers(KIOCore_HEADERS
   HEADER_NAMES
   KSSLSettings
 
   RELATIVE kssl
   REQUIRED_HEADERS KIOCore_HEADERS
 )
 install(FILES ${KIOCore_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KIOCore/KIO COMPONENT Devel)
 
 install(FILES
   ksslcertificatemanager_p.h
   ${KIOCore_HEADERS}
   ${CMAKE_CURRENT_BINARY_DIR}/kiocore_export.h
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KIOCore COMPONENT Devel)
 
 install(FILES accept-languages.codes DESTINATION ${KDE_INSTALL_CONFDIR})
 
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KIOCore LIB_NAME KF5KIOCore DEPS "KCoreAddons KService" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KIOCore)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})