diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index f1cde27b0..e2cdfbf14 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -2,12 +2,12 @@ include(ECMMarkAsTest)
 
 set(falkon_autotests_SRCS )
 
-qt5_add_resources(falkon_autotests_SRCS autotests.qrc)
+qt_add_resources(falkon_autotests_SRCS autotests.qrc)
 
 macro(falkon_tests)
     foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp ${falkon_autotests_SRCS})
-        target_link_libraries(${_testname} Qt5::Test FalkonPrivate)
+        add_executable(${_testname} ${_testname}.cpp ${_testname}.h ${falkon_autotests_SRCS})
+        target_link_libraries(${_testname} Qt::Test FalkonPrivate)
         add_test(NAME falkon-${_testname} COMMAND ${_testname})
         ecm_mark_as_test(${_testname})
         set_tests_properties(falkon-${_testname} PROPERTIES RUN_SERIAL TRUE)
@@ -46,7 +46,7 @@ set(falkon_autotests_SRCS
 macro(falkon_qml_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} qml/${_testname}.cpp ${falkon_autotests_SRCS})
-        target_link_libraries(${_testname} Qt5::Test FalkonPrivate)
+        target_link_libraries(${_testname} Qt::Test FalkonPrivate)
         add_test(NAME falkon-qml-${_testname} COMMAND ${_testname})
         ecm_mark_as_test(${_testname})
         set_tests_properties(falkon-qml-${_testname} PROPERTIES RUN_SERIAL TRUE)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 3b7efff04..e0a0f0b43 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -283,7 +283,7 @@ if (APPLE)
 endif()
 
 # TODO: use ki18n_wrap_ui?
-qt5_wrap_ui(SRCS
+qt_wrap_ui(SRCS
     adblock/adblockaddsubscriptiondialog.ui
     adblock/adblockdialog.ui
     autofill/autofillnotification.ui
@@ -331,7 +331,7 @@ qt5_wrap_ui(SRCS
     webtab/searchtoolbar.ui
 )
 
-qt5_add_resources(SRCS
+qt_add_resources(SRCS
     data/data.qrc
     data/html.qrc
     data/icons.qrc
@@ -341,17 +341,17 @@ qt5_add_resources(SRCS
 
 add_library(FalkonPrivate SHARED ${SRCS} ${LOGGING_SRCS})
 
-get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt5::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+get_property(QT_WEBENGINE_INCLUDE_DIRS TARGET Qt::WebEngine PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 target_include_directories(FalkonPrivate SYSTEM PUBLIC ${QT_WEBENGINE_INCLUDE_DIRS})
 
 target_link_libraries(FalkonPrivate
-    Qt5::Widgets
-    Qt5::WebEngineWidgets
-    Qt5::Network
-    Qt5::Sql
-    Qt5::PrintSupport
-    Qt5::QuickWidgets
-    Qt5::WebChannel
+    Qt::Widgets
+    Qt::WebEngineWidgets
+    Qt::Network
+    Qt::Sql
+    Qt::PrintSupport
+    Qt::QuickWidgets
+    Qt::WebChannel
     KF5::Archive
     ${OPENSSL_CRYPTO_LIBRARY}
 )
@@ -363,7 +363,7 @@ endif()
 
 if (UNIX AND NOT APPLE)
     if (NOT NO_X11)
-        target_link_libraries(FalkonPrivate XCB::XCB Qt5::X11Extras)
+        target_link_libraries(FalkonPrivate XCB::XCB Qt::X11Extras)
     endif()
 
     set_target_properties(FalkonPrivate PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION "3")
@@ -371,7 +371,7 @@ if (UNIX AND NOT APPLE)
 endif()
 
 if (WIN32)
-    target_link_libraries(FalkonPrivate Qt5::WinExtras)
+    target_link_libraries(FalkonPrivate Qt::WinExtras)
 endif()
 
 if (APPLE)
@@ -379,5 +379,5 @@ if (APPLE)
 endif()
 
 if (NOT DISABLE_DBUS)
-    target_link_libraries(FalkonPrivate Qt5::DBus)
+    target_link_libraries(FalkonPrivate Qt::DBus)
 endif()
diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h
index 92a453c52..5b51c3cdf 100644
--- a/src/lib/app/qzcommon.h
+++ b/src/lib/app/qzcommon.h
@@ -20,7 +20,7 @@
 
 #include <QDebug>
 #include <QFlags>
-#include <QtWebEngineVersion>
+#include <QtWebEngine/QtWebEngineVersion>
 
 #ifdef FALKON_SHAREDLIBRARY
 #define FALKON_EXPORT Q_DECL_EXPORT
diff --git a/src/plugins/AutoScroll/CMakeLists.txt b/src/plugins/AutoScroll/CMakeLists.txt
index dc3aaa18f..1f0cdabf1 100644
--- a/src/plugins/AutoScroll/CMakeLists.txt
+++ b/src/plugins/AutoScroll/CMakeLists.txt
@@ -10,12 +10,12 @@ ecm_create_qm_loader( AutoScroll_SRCS falkon_autoscroll_qt )
 set( AutoScroll_UIS
 	autoscrollsettings.ui
 	)
-qt5_wrap_ui(UIS ${AutoScroll_UIS})
+qt_wrap_ui(UIS ${AutoScroll_UIS})
 
 set( AutoScroll_RSCS
 	autoscroll.qrc
 	)
-qt5_add_resources(RSCS ${AutoScroll_RSCS})
+qt_add_resources(RSCS ${AutoScroll_RSCS})
 
 add_library(AutoScroll MODULE ${AutoScroll_SRCS} ${UIS} ${RSCS})
 install(TARGETS AutoScroll DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/FlashCookieManager/CMakeLists.txt b/src/plugins/FlashCookieManager/CMakeLists.txt
index e39f31c62..8afdc1747 100644
--- a/src/plugins/FlashCookieManager/CMakeLists.txt
+++ b/src/plugins/FlashCookieManager/CMakeLists.txt
@@ -10,12 +10,12 @@ set( FlashCookieManager_UIS
 	fcm_dialog.ui
 	fcm_notification.ui
 	)
-qt5_wrap_ui(UIS ${FlashCookieManager_UIS})
+qt_wrap_ui(UIS ${FlashCookieManager_UIS})
 
 set( FlashCookieManager_RSCS
 	flashcookiemanager.qrc
 	)
-qt5_add_resources(RSCS ${FlashCookieManager_RSCS})
+qt_add_resources(RSCS ${FlashCookieManager_RSCS})
 
 add_library(FlashCookieManager MODULE ${FlashCookieManager_SRCS} ${UIS} ${RSCS})
 install(TARGETS FlashCookieManager DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/GreaseMonkey/CMakeLists.txt b/src/plugins/GreaseMonkey/CMakeLists.txt
index a945ed608..e7fa0c3f3 100644
--- a/src/plugins/GreaseMonkey/CMakeLists.txt
+++ b/src/plugins/GreaseMonkey/CMakeLists.txt
@@ -23,12 +23,12 @@ set( GreaseMonkey_UIS
 	settings/gm_settings.ui
 	settings/gm_settingsscriptinfo.ui
 	)
-qt5_wrap_ui(UIS ${GreaseMonkey_UIS})
+qt_wrap_ui(UIS ${GreaseMonkey_UIS})
 
 set( GreaseMonkey_RSCS
 	greasemonkey.qrc
 	)
-qt5_add_resources(RSCS ${GreaseMonkey_RSCS})
+qt_add_resources(RSCS ${GreaseMonkey_RSCS})
 
 add_library(GreaseMonkey MODULE ${GreaseMonkey_SRCS} ${UIS} ${RSCS})
 install(TARGETS GreaseMonkey DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/KDEFrameworksIntegration/CMakeLists.txt b/src/plugins/KDEFrameworksIntegration/CMakeLists.txt
index 86a6786cb..e3e38072e 100644
--- a/src/plugins/KDEFrameworksIntegration/CMakeLists.txt
+++ b/src/plugins/KDEFrameworksIntegration/CMakeLists.txt
@@ -9,7 +9,7 @@ ecm_create_qm_loader(KDEFrameworksIntegration_SRCS falkon_kdeframeworksintegrati
 set(KDEFrameworksIntegration_RSCS
     kdeframeworksintegration.qrc
 )
-qt5_add_resources(RSCS ${KDEFrameworksIntegration_RSCS})
+qt_add_resources(RSCS ${KDEFrameworksIntegration_RSCS})
 
 add_library(KDEFrameworksIntegration MODULE ${KDEFrameworksIntegration_SRCS} ${RSCS})
 install(TARGETS KDEFrameworksIntegration DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/MouseGestures/CMakeLists.txt b/src/plugins/MouseGestures/CMakeLists.txt
index 7d7caf4a8..15fd85e10 100644
--- a/src/plugins/MouseGestures/CMakeLists.txt
+++ b/src/plugins/MouseGestures/CMakeLists.txt
@@ -19,12 +19,12 @@ ecm_create_qm_loader( MouseGestures_SRCS falkon_mousegestures_qt )
 set( MouseGestures_UIS
 	mousegesturessettingsdialog.ui
 	)
-qt5_wrap_ui(UIS ${MouseGestures_UIS})
+qt_wrap_ui(UIS ${MouseGestures_UIS})
 
 set( MouseGestures_RSCS
 	mousegestures.qrc
 	)
-qt5_add_resources(RSCS ${MouseGestures_RSCS})
+qt_add_resources(RSCS ${MouseGestures_RSCS})
 
 KDE_ENABLE_EXCEPTIONS()
 
diff --git a/src/plugins/PIM/CMakeLists.txt b/src/plugins/PIM/CMakeLists.txt
index 8bebe5eca..cffdb09c9 100644
--- a/src/plugins/PIM/CMakeLists.txt
+++ b/src/plugins/PIM/CMakeLists.txt
@@ -9,12 +9,12 @@ ecm_create_qm_loader( PIM_SRCS falkon_pim_qt )
 set( PIM_UIS
 	PIM_settings.ui
 	)
-qt5_wrap_ui(UIS ${PIM_UIS})
+qt_wrap_ui(UIS ${PIM_UIS})
 
 set( PIM_RSCS
 	PIM_res.qrc
 	)
-qt5_add_resources(RSCS ${PIM_RSCS})
+qt_add_resources(RSCS ${PIM_RSCS})
 
 add_library(PIM MODULE ${PIM_SRCS} ${UIS} ${RSCS})
 install(TARGETS PIM DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/StatusBarIcons/CMakeLists.txt b/src/plugins/StatusBarIcons/CMakeLists.txt
index 552d81265..e435c8f68 100644
--- a/src/plugins/StatusBarIcons/CMakeLists.txt
+++ b/src/plugins/StatusBarIcons/CMakeLists.txt
@@ -20,12 +20,12 @@ set( StatusBarIcons_UIS
 	sbi_networkicondialog.ui
 	sbi_settingsdialog.ui
 	)
-qt5_wrap_ui(UIS ${StatusBarIcons_UIS})
+qt_wrap_ui(UIS ${StatusBarIcons_UIS})
 
 set( StatusBarIcons_RSCS
 	statusbaricons.qrc
 	)
-qt5_add_resources(RSCS ${StatusBarIcons_RSCS})
+qt_add_resources(RSCS ${StatusBarIcons_RSCS})
 
 add_library(StatusBarIcons MODULE ${StatusBarIcons_SRCS} ${UIS} ${RSCS})
 install(TARGETS StatusBarIcons DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/TabManager/CMakeLists.txt b/src/plugins/TabManager/CMakeLists.txt
index d3beae177..3c5043783 100644
--- a/src/plugins/TabManager/CMakeLists.txt
+++ b/src/plugins/TabManager/CMakeLists.txt
@@ -13,13 +13,13 @@ set( TabManager_UIS
 	tabmanagerwidget.ui
 	tabmanagersettings.ui
 	)
-qt5_wrap_ui(UIS ${TabManager_UIS})
+qt_wrap_ui(UIS ${TabManager_UIS})
 
 set( TabManager_RSCS
 	tabmanagerplugin.qrc
 	tldextractor/tldextractor.qrc
 	)
-qt5_add_resources(RSCS ${TabManager_RSCS})
+qt_add_resources(RSCS ${TabManager_RSCS})
 
 add_library(TabManager MODULE ${TabManager_SRCS} ${UIS} ${RSCS})
 install(TARGETS TabManager DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/src/plugins/TestPlugin/testplugin_sidebar.h b/src/plugins/TestPlugin/testplugin_sidebar.h
index efdd19fba..906e1bbe2 100644
--- a/src/plugins/TestPlugin/testplugin_sidebar.h
+++ b/src/plugins/TestPlugin/testplugin_sidebar.h
@@ -26,10 +26,10 @@ class TestPlugin_Sidebar : public SideBarInterface
 public:
     explicit TestPlugin_Sidebar(QObject* parent = 0);
 
-    QString title() const;
-    QAction* createMenuAction();
+    QString title() const override;
+    QAction* createMenuAction() override;
 
-    QWidget* createSideBarWidget(BrowserWindow* mainWindow);
+    QWidget* createSideBarWidget(BrowserWindow* mainWindow) override;
 };
 
 #endif // TESTPLUGIN_SIDEBAR_H
diff --git a/src/plugins/VerticalTabs/CMakeLists.txt b/src/plugins/VerticalTabs/CMakeLists.txt
index 943973472..d18849cd7 100644
--- a/src/plugins/VerticalTabs/CMakeLists.txt
+++ b/src/plugins/VerticalTabs/CMakeLists.txt
@@ -17,12 +17,12 @@ ecm_create_qm_loader( VerticalTabs_SRCS falkon_verticaltabs_qt )
 set( VerticalTabs_UIS
     verticaltabssettings.ui
 )
-qt5_wrap_ui(UIS ${VerticalTabs_UIS})
+qt_wrap_ui(UIS ${VerticalTabs_UIS})
 
 set( VerticalTabs_RSCS
     verticaltabs.qrc
 )
-qt5_add_resources(RSCS ${VerticalTabs_RSCS})
+qt_add_resources(RSCS ${VerticalTabs_RSCS})
 
 add_library(VerticalTabs MODULE ${VerticalTabs_SRCS} ${UIS} ${RSCS})
 install(TARGETS VerticalTabs DESTINATION ${FALKON_INSTALL_PLUGINDIR})
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
index d9aa15a8c..ee4f8e5bf 100644
--- a/tests/benchmarks/CMakeLists.txt
+++ b/tests/benchmarks/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(falkon_benchmarks_SRCS )
 
-qt5_add_resources(falkon_benchmarks_SRCS benchmarks.qrc)
+qt_add_resources(falkon_benchmarks_SRCS benchmarks.qrc)
 
 macro(falkon_benchmarks)
     foreach(_benchmarkname ${ARGN})
         add_executable(${_benchmarkname} ${_benchmarkname}.cpp ${falkon_benchmarks_SRCS})
-        target_link_libraries(${_benchmarkname} Qt5::Test FalkonPrivate)
+        target_link_libraries(${_benchmarkname} Qt::Test FalkonPrivate)
         #add_test(NAME falkon-${_benchmarkname} COMMAND ${_benchmarkname})
         #ecm_mark_as_test(${_benchmarkname})
         #set_tests_properties(falkon-${_benchmarkname} PROPERTIES RUN_SERIAL TRUE)