diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4b5ffbb3a..db4bdce2a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,126 +1,126 @@
 if(BUILD_TESTING)
     # only with this definition will the KONQ_TESTS_EXPORT macro do something
-    add_definitions(-DCOMPILING_TESTS)
+    add_definitions(-DBUILD_TESTING)
 endif(BUILD_TESTING)
 
 add_subdirectory( tests )
 
 add_definitions(-DTRANSLATION_DOMAIN=\"konqueror\")
 
 if (KActivities_FOUND)
   include_directories(${KACTIVITIES_INCLUDE_DIRS})
 endif (KActivities_FOUND)
 
 ########### libkonquerorprivate, shared with unit tests and sidebar modules ###############
 
 set(konquerorprivate_SRCS
    konqhistorymanager.cpp # for unit tests
    konqpixmapprovider.cpp # needed ?!?
 
    # for the sidebar history module
    konqhistorymodel.cpp
    ksortfilterproxymodel.cpp
    konqhistoryproxymodel.cpp
    konqhistoryview.cpp
    konqhistorysettings.cpp
 )
 
 add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
 target_link_libraries(konquerorprivate
    KF5::IconThemes
    KF5::Konq
    KF5::Parts
    KF5::KIOGui
 )
 
 if(X11_FOUND)
   target_link_libraries(konquerorprivate Qt5::X11Extras)
 endif(X11_FOUND)
 
 
 set_target_properties(konquerorprivate PROPERTIES VERSION ${KONQUEROR_LIB_VERSION} SOVERSION "5" )
 install(TARGETS konquerorprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 
 include(GenerateExportHeader)
 generate_export_header(konquerorprivate BASE_NAME konquerorprivate EXPORT_FILE_NAME konquerorprivate_export.h)
 
 ########### konqueror ###############
 
 set(konqueror_KDEINIT_SRCS
    konqapplication.cpp
    konqguiclients.cpp
    konqrun.cpp
    konqview.cpp
    konqviewmanager.cpp
    konqmouseeventfilter.cpp
    konqmisc.cpp
    konqdraggablelabel.cpp
    konqframe.cpp
    konqframevisitor.cpp
    konqframestatusbar.cpp
    konqframecontainer.cpp
    konqtabs.cpp
    konqactions.cpp
    konqsessiondlg.cpp
    konqfactory.cpp
    konqcombo.cpp
    konqbrowseriface.cpp
    konqpreloadinghandler.cpp
    delayedinitializer.cpp
    konqanimatedlogo.cpp
    konqmainwindow.cpp
    konqmainwindowfactory.cpp
    konqextensionmanager.cpp
    konqbookmarkbar.cpp
    konqsettings.cpp
    KonquerorAdaptor.cpp
    KonqMainWindowAdaptor.cpp
    KonqViewAdaptor.cpp
    konqundomanager.cpp
    konqclosedwindowsmanager.cpp
    konqsessionmanager.cpp
    konqcloseditem.cpp
    konqhistorydialog.cpp
    konq_statusbarmessagelabel.cpp
 )
 
 kconfig_add_kcfg_files(konqueror_KDEINIT_SRCS konqsettingsxt.kcfgc)
 ki18n_wrap_ui(konqueror_KDEINIT_SRCS konqsessiondlg_base.ui)
 ki18n_wrap_ui(konqueror_KDEINIT_SRCS konqnewsessiondlg_base.ui)
 
 qt5_add_dbus_interface(konqueror_KDEINIT_SRCS org.kde.Konqueror.Main.xml konqueror_interface)
 qt5_add_dbus_adaptor(konqueror_KDEINIT_SRCS org.kde.Konqueror.UndoManager.xml konqclosedwindowsmanager.h KonqClosedWindowsManager konqclosedwindowsmanageradaptor KonqClosedWindowsManagerAdaptor)
 qt5_add_dbus_interface(konqueror_KDEINIT_SRCS org.kde.Konqueror.UndoManager.xml konqclosedwindowsmanager_interface)
 qt5_add_dbus_adaptor(konqueror_KDEINIT_SRCS org.kde.Konqueror.SessionManager.xml konqsessionmanager.h KonqSessionManager konqsessionmanageradaptor KonqSessionManagerAdaptor)
 qt5_add_dbus_interface(konqueror_KDEINIT_SRCS org.kde.Konqueror.SessionManager.xml konqsessionmanager_interface)
 
 kde4_add_app_icon(konqueror_KDEINIT_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/konqueror.png")
 kf5_add_kdeinit_executable(konqueror ${konqueror_KDEINIT_SRCS} konqmain.cpp)
 target_link_libraries(kdeinit_konqueror
    konquerorprivate
    KF5::Archive
    KF5::KCMUtils
    KF5::Konq
    KF5::Parts
    KF5::DBusAddons
    KF5::KDELibs4Support
    KF5::Crash
 )
 
 if (X11_FOUND)
   target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
 endif ()
 
 if (KActivities_FOUND)
   target_link_libraries(kdeinit_konqueror ${KACTIVITIES_LIBRARY})
 endif (KActivities_FOUND)
 
 if (NOT WIN32)
     install(TARGETS kdeinit_konqueror  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 endif (NOT WIN32)
 install(TARGETS konqueror ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 install( FILES konqueror.kcfg  DESTINATION  ${KDE_INSTALL_KCFGDIR} )
 install( FILES konqueror.rc DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/konqueror )
 install( FILES org.kde.Konqueror.Main.xml org.kde.Konqueror.MainWindow.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
diff --git a/src/konqprivate_export.h b/src/konqprivate_export.h
index 9cc7be4bf..a6c97b5f5 100644
--- a/src/konqprivate_export.h
+++ b/src/konqprivate_export.h
@@ -1,34 +1,34 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 David Faure <faure@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #ifndef KONQPRIVATE_EXPORT_H
 #define KONQPRIVATE_EXPORT_H
 
 #include "konquerorprivate_export.h"
 
 /* Classes from the Konqueror application, which are exported only for unit tests */
-#ifdef COMPILING_TESTS
+#ifdef BUILD_TESTING
 # ifndef KONQ_TESTS_EXPORT
 #  define KONQ_TESTS_EXPORT KONQUERORPRIVATE_EXPORT
 # endif
 #else /* not compiling tests */
 # define KONQ_TESTS_EXPORT
 #endif
 
 #endif