Re-enable DLT logging and prefix all features to prevent naming clashes

Change-Id: I531a35615e430809242f5a7638e740070b214fba
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

19 files changed, 86 insertions, 77 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d84b673..0a4505f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
     QuickTest
     Widgets
     ZlibPrivate
-    GeniviExtras
+    DltLogging
 )
 
 if(NOT TARGET Qt::Gui OR NOT TARGET Qt::Quick)
diff --git a/doc/applicationmanager-project.qdocconf b/doc/applicationmanager-project.qdocconf
index f5a2ffa9..68f4e82d 100644
--- a/doc/applicationmanager-project.qdocconf
+++ b/doc/applicationmanager-project.qdocconf
@@ -57,8 +57,7 @@ sourcedirs += \
 imagedirs += ../doc/images
 exampledirs = ../examples
 
-depends += qtcore qtquick qtqml qtdoc qtwaylandcompositor qtwidgets qtgeniviextras
-
+depends += qtcore qtquick qtqml qtdoc qtwaylandcompositor qtwidgets dltlogging
 qhp.projects                               = ApplicationManager
 qhp.ApplicationManager.file                = applicationmanager.qhp
 qhp.ApplicationManager.namespace           = io.qt.applicationmanager.$QT_VERSION_TAG
diff --git a/doc/debugging.qdoc b/doc/debugging.qdoc
index 5461e81d..a94b1814 100644
--- a/doc/debugging.qdoc
+++ b/doc/debugging.qdoc
@@ -35,7 +35,7 @@
 \section1 Logging
 
 The application manager installs its own message handler to format logging output neatly. If the
-\l{Qt GENIVI Extras}{QtGeniviExtras} module is available, this message handler passes the output
+\l{Qt DLT Logging}{QtQtDltLogging} module is available, this message handler passes the output
 to GENIVI Diagnostic Log and Trace (DLT).
 
 \section2 Categories
diff --git a/doc/doc.pro b/doc/doc.pro
index 7d340a26..2baaf8e9 100644
--- a/doc/doc.pro
+++ b/doc/doc.pro
@@ -6,7 +6,7 @@ QT = core network
 qtHaveModule(quick):QT *= quick
 qtHaveModule(dbus): QT *= dbus
 qtHaveModule(widgets): QT *= widgets
-qtHaveModule(geniviextras):QT *= geniviextras
+qtHaveModule(dltlogging):QT *= dltlogging
 
 # needed for the new clang based qdoc parser in Qt 5.11
 !prefix_build:INCLUDEPATH *= $$[QT_INSTALL_HEADERS]
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index 7c15cf95..23fbb887 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -1,15 +1,15 @@
-if(NOT QT_FEATURE_system_libarchive AND QT_FEATURE_installer)
+if(NOT QT_FEATURE_am_system_libarchive AND QT_FEATURE_am_installer)
     add_subdirectory(libarchive)
 endif()
 
-if(NOT QT_FEATURE_system_libyaml)
+if(NOT QT_FEATURE_am_system_libyaml)
     add_subdirectory(libyaml)
 endif()
 
-if(QT_FEATURE_libbacktrace)
+if(QT_FEATURE_am_libbacktrace)
     add_subdirectory(libbacktrace)
 endif()
 
-if(QT_FEATURE_stackwalker)
+if(QT_FEATURE_am_stackwalker)
     add_subdirectory(stackwalker)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b08bcf15..27bd8515 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,12 +7,12 @@ add_subdirectory(3rdparty)
 add_subdirectory(common-lib)
 add_subdirectory(application-lib)
 
-if(QT_FEATURE_installer)
+if(QT_FEATURE_am_installer)
     add_subdirectory(crypto-lib)
     add_subdirectory(package-lib)
 endif()
 
-# if(NOT QT_FEATURE_tools_only)
+if(NOT QT_FEATURE_am_tools_only)
     add_subdirectory(plugin-interfaces)
     add_subdirectory(notification-lib)
     add_subdirectory(monitor-lib)
@@ -22,7 +22,7 @@ endif()
     add_subdirectory(manager-lib)
     add_subdirectory(window-lib)
 
-    if(TARGET Qt::DBus AND QT_FEATURE_external_dbus_interfaces)
+    if(TARGET Qt::DBus AND QT_FEATURE_am_external_dbus_interfaces)
         add_subdirectory(dbus-lib)
     endif()
 
@@ -35,17 +35,17 @@ endif()
     endif()
 
     # This tool links against everything to extract the Qml type information
-    if (QT_FEATURE_installer AND TARGET Qt::DBus)
+    if (QT_FEATURE_am_installer AND TARGET Qt::DBus)
         add_subdirectory(tools/dumpqmltypes)
     endif()
 
-    if (TARGET Qt::DBus AND QT_FEATURE_multi_process)
+    if (TARGET Qt::DBus AND QT_FEATURE_am_multi_process)
         add_subdirectory(tools/launcher-qml)
     endif()
-# endif()
+endif()
 
-if(NOT CMAKE_CROSSCOMPILING OR QT_FEATURE_tools_only)
-    if (QT_FEATURE_installer)
+if(NOT CMAKE_CROSSCOMPILING OR QT_FEATURE_am_tools_only)
+    if (QT_FEATURE_am_installer)
         add_subdirectory(tools/packager)
     endif()
 
diff --git a/src/common-lib/CMakeLists.txt b/src/common-lib/CMakeLists.txt
index 75d795d5..8976418e 100644
--- a/src/common-lib/CMakeLists.txt
+++ b/src/common-lib/CMakeLists.txt
@@ -37,11 +37,9 @@ qt_internal_add_module(AppManCommonPrivate
         Qt::QmlPrivate
 )
 
-qt_internal_extend_target(AppManCommonPrivate CONDITION TARGET Qt::GeniviExtras
-    DEFINES
-        AM_GENIVIEXTRAS_LAZY_INIT
+qt_internal_extend_target(AppManCommonPrivate CONDITION TARGET Qt::DltLogging
     PUBLIC_LIBRARIES
-        Qt::GeniviExtras
+        Qt::DltLogging
 )
 
 qt_internal_extend_target(AppManCommonPrivate CONDITION TARGET Qt::DBus
@@ -56,22 +54,22 @@ qt_internal_extend_target(AppManCommonPrivate CONDITION LINUX
         dl
 )
 
-qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_libbacktrace
+qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_am_libbacktrace
     LIBRARIES
         Qt::BundledBacktrace
 )
 
-qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_stackwalker
+qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_am_stackwalker
     LIBRARIES
         Qt::BundledStackwalker
 )
 
-qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_system_libyaml
+qt_internal_extend_target(AppManCommonPrivate CONDITION QT_FEATURE_am_system_libyaml
     LIBRARIES
         WrapLibYaml::WrapLibYaml
 )
 
-qt_internal_extend_target(AppManCommonPrivate CONDITION NOT QT_FEATURE_system_libyaml
+qt_internal_extend_target(AppManCommonPrivate CONDITION NOT QT_FEATURE_am_system_libyaml
     LIBRARIES
         Qt::BundledLibYaml
 )
diff --git a/src/common-lib/common-lib.pro b/src/common-lib/common-lib.pro
index d9efdd85..c4099f82 100644
--- a/src/common-lib/common-lib.pro
+++ b/src/common-lib/common-lib.pro
@@ -11,7 +11,7 @@ qtHaveModule(qml):QT *= qml qml-private
 
 linux:LIBS += -ldl
 
-qtHaveModule(geniviextras):DEFINES *= AM_GENIVIEXTRAS_LAZY_INIT
+qtHaveModule(geniviextras):DEFINES *= AM_DLTLOGGING_LAZY_INIT
 
 CONFIG *= static internal_module
 CONFIG -= create_cmake
diff --git a/src/common-lib/configure.cmake b/src/common-lib/configure.cmake
index e20cf5f0..651b14c4 100644
--- a/src/common-lib/configure.cmake
+++ b/src/common-lib/configure.cmake
@@ -1,3 +1,6 @@
+# all features are prefixed with "am" to prevent clashes with features in
+# other Qt modules
+
 #### Inputs
 
 set(INPUT_libyaml "undefined" CACHE STRING "")
@@ -14,61 +17,69 @@ qt_find_package(WrapLibYaml PROVIDED_TARGETS WrapLibYaml::WrapLibYaml MODULE_NAM
 
 #### Features
 
-qt_feature("system-libyaml" PRIVATE
+qt_feature("am-system-libyaml" PRIVATE
     LABEL "Using system libyaml"
     CONDITION WrapLibYaml_FOUND
     ENABLE INPUT_libyaml STREQUAL 'system'
     DISABLE INPUT_libyaml STREQUAL 'qt'
 )
 
-qt_feature("multi-process" PUBLIC
+qt_feature("am-multi-process" PUBLIC
     LABEL "Multi-process mode"
     CONDITION TARGET Qt::DBus AND TARGET Qt::WaylandCompositor AND LINUX
     ENABLE INPUT_force_mode STREQUAL 'multi'
     DISABLE INPUT_force_mode STREQUAL 'single'
 )
-qt_feature_definition("multi-process" "AM_MULTI_PROCESS")
+qt_feature_definition("am-multi-process" "AM_MULTI_PROCESS")
 
-qt_feature("installer" PRIVATE
+qt_feature("am-installer" PRIVATE
     LABEL "Enable the installer component"
     CONDITION QT_FEATURE_ssl
     DISABLE INPUT_installer STREQUAL 'no'
 )
-qt_feature_definition("installer" "AM_DISABLE_INSTALLER" NEGATE)
+qt_feature_definition("am-installer" "AM_DISABLE_INSTALLER" NEGATE)
 
-qt_feature("external-dbus-interfaces" PRIVATE
+qt_feature("am-external-dbus-interfaces" PRIVATE
     LABEL "Enable external DBus interfaces"
     CONDITION NOT INPUT_external_dbus_interfaces STREQUAL 'no' AND TARGET Qt::DBus
 )
-qt_feature_definition("external-dbus-interfaces" "AM_DISABLE_EXTERNAL_DBUS_INTERFACES" NEGATE)
+qt_feature_definition("am-external-dbus-interfaces" "AM_DISABLE_EXTERNAL_DBUS_INTERFACES" NEGATE)
 
-qt_feature("tools-only" PRIVATE
+qt_feature("am-tools-only" PRIVATE
     LABEL "Tools only build"
     CONDITION INPUT_tools_only STREQUAL 'yes'
 )
 
-qt_feature("libbacktrace" PRIVATE
+qt_feature("am-dltlogging" PRIVATE
+    LABEL "Enable logging via DLT"
+    CONDITION TARGET Qt::DltLogging
+    DISABLE INPUT_dltlogging STREQUAL 'no'
+)
+qt_feature_definition("am-dltlogging" "AM_USE_DLTLOGGING")
+
+qt_feature("am-libbacktrace" PRIVATE
     LABEL "Enable support for libbacktrace"
     CONDITION LINUX AND ( ( INPUT_libbacktrace STREQUAL 'yes' ) OR ( ( CMAKE_BUILD_TYPE STREQUAL "Debug" ) AND ( NOT INPUT_libbacktrace STREQUAL 'no' ) ) )
     EMIT_IF LINUX
 )
-qt_feature_definition("libbacktrace" "AM_USE_LIBBACKTRACE")
+qt_feature_definition("am-libbacktrace" "AM_USE_LIBBACKTRACE")
 
-qt_feature("stackwalker" PRIVATE
+qt_feature("am-stackwalker" PRIVATE
     LABEL "Enable support for StackWalker"
     CONDITION WIN32 AND ( ( INPUT_stackwalker STREQUAL 'yes' ) OR ( ( CMAKE_BUILD_TYPE STREQUAL "Debug") AND (NOT INPUT_stackwalker STREQUAL 'no' ) ) )
     EMIT_IF WIN32
 )
-qt_feature_definition("stackwalker" "AM_USE_STACKWALKER")
+qt_feature_definition("am-stackwalker" "AM_USE_STACKWALKER")
 
 qt_configure_add_summary_section(NAME "Qt Application Manager")
-qt_configure_add_summary_entry(ARGS "system-libyaml")
-qt_configure_add_summary_entry(ARGS "multi-process")
-qt_configure_add_summary_entry(ARGS "installer")
-qt_configure_add_summary_entry(ARGS "external-dbus-interfaces")
-qt_configure_add_summary_entry(ARGS "tools-only")
-qt_configure_add_summary_entry(ARGS "libbacktrace")
-qt_configure_add_summary_entry(ARGS "stackwalker")
+qt_configure_add_summary_entry(ARGS "am-system-libyaml")
+qt_configure_add_summary_entry(ARGS "am-multi-process")
+qt_configure_add_summary_entry(ARGS "am-installer")
+qt_configure_add_summary_entry(ARGS "am-external-dbus-interfaces")
+qt_configure_add_summary_entry(ARGS "am-tools-only")
+qt_configure_add_summary_entry(ARGS "am-dltlogging")
+qt_configure_add_summary_entry(ARGS "am-libbacktrace")
+qt_configure_add_summary_entry(ARGS "am-stackwalker")
 qt_configure_end_summary_section() # end of "Qt ApplicationManger" section
 
 qt_extra_definition("AM_VERSION" "\"${PROJECT_VERSION}\"" PUBLIC)
diff --git a/src/common-lib/logging.cpp b/src/common-lib/logging.cpp
index c05746cc..e94eb15c 100644
--- a/src/common-lib/logging.cpp
+++ b/src/common-lib/logging.cpp
@@ -69,9 +69,9 @@ Q_CORE_EXPORT void qWinMsgHandler(QtMsgType t, const char* str);
 #  include <android/log.h>
 #endif
 
-#if defined(QT_GENIVIEXTRAS_LIB)
-#  include <QtGeniviExtras/QtDlt>
-#  include <QtGeniviExtras/QDltRegistration>
+#if defined(AM_USE_DLTLOGGING)
+#  include <QtDltLogging/QtDlt>
+#  include <QtDltLogging/QDltRegistration>
 #else
 #  define QDLT_LOGGING_CATEGORY(a,b,c,d) Q_LOGGING_CATEGORY(a,b)
 #  define QDLT_FALLBACK_CATEGORY(a)
@@ -84,7 +84,7 @@ Q_CORE_EXPORT void qWinMsgHandler(QtMsgType t, const char* str);
 
 QT_BEGIN_NAMESPACE_AM
 
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
 static const char *s_defaultSystemUiDltId = "QTAM";
 static const char *s_defaultSystemUiDltDescription = "Qt Application Manager";
 #endif
@@ -185,7 +185,7 @@ struct DeferredMessage {
 
 
 bool Logging::s_dltEnabled =
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
         true;
 #else
         false;
@@ -372,7 +372,7 @@ static void colorLogToStderr(QtMsgType msgType, const QMessageLogContext &contex
 
 void Logging::messageHandler(QtMsgType msgType, const QMessageLogContext &context, const QString &message)
 {
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
     if (s_dltEnabled)
         QDltRegistration::messageHandler(msgType, context, message);
 #endif
@@ -422,7 +422,7 @@ void Logging::setFilterRules(const QStringList &rules)
 {
     s_rules = rules;
     QString rulesStr = rules.join(qL1C('\n'));
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
     if (s_dltEnabled)
         rulesStr += qSL("\ngeneral=true");
 #endif
@@ -493,7 +493,7 @@ void Logging::setDltEnabled(bool enabled)
 
 void Logging::registerUnregisteredDltContexts()
 {
-#ifdef AM_GENIVIEXTRAS_LAZY_INIT
+#if defined(AM_USE_DLTLOGGING)
     if (s_dltEnabled)
         globalDltRegistration()->registerUnregisteredContexts();
 #endif
@@ -501,7 +501,7 @@ void Logging::registerUnregisteredDltContexts()
 
 void Logging::setSystemUiDltId(const QByteArray &dltAppId, const QByteArray &dltAppDescription)
 {
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
     if (s_dltEnabled) {
         const QByteArray id = dltAppId.isEmpty() ? QByteArray(s_defaultSystemUiDltId) : dltAppId;
         const QByteArray description = dltAppDescription.isEmpty() ? QByteArray(s_defaultSystemUiDltDescription)
@@ -516,7 +516,7 @@ void Logging::setSystemUiDltId(const QByteArray &dltAppId, const QByteArray &dlt
 
 void Logging::setDltApplicationId(const QByteArray &dltAppId, const QByteArray &dltAppDescription)
 {
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
     if (s_dltEnabled)
         globalDltRegistration()->registerApplication(dltAppId, dltAppDescription);
 #else
@@ -527,7 +527,7 @@ void Logging::setDltApplicationId(const QByteArray &dltAppId, const QByteArray &
 
 void Logging::logToDlt(QtMsgType msgType, const QMessageLogContext &context, const QString &message)
 {
-#if defined(QT_GENIVIEXTRAS_LIB)
+#if defined(AM_USE_DLTLOGGING)
     if (s_dltEnabled)
         QDltRegistration::messageHandler(msgType, context, message);
 #else
diff --git a/src/common-lib/qt_cmdline.cmake b/src/common-lib/qt_cmdline.cmake
index f3641516..5dad28b7 100644
--- a/src/common-lib/qt_cmdline.cmake
+++ b/src/common-lib/qt_cmdline.cmake
@@ -3,6 +3,7 @@ qt_commandline_option(force-multi-process TYPE enum NAME force_mode VALUE multi)
 qt_commandline_option(installer TYPE boolean)
 qt_commandline_option(external-dbus-interfaces TYPE boolean)
 qt_commandline_option(tools-only TYPE boolean)
+qt_commandline_option(dltlogging TYPE boolean)
 qt_commandline_option(libbacktrace TYPE boolean)
 qt_commandline_option(stackwalker TYPE boolean)
 qt_commandline_option(libyaml TYPE enum VALUES qt system)
diff --git a/src/dbus-lib/CMakeLists.txt b/src/dbus-lib/CMakeLists.txt
index 8c371423..8d3a04c5 100644
--- a/src/dbus-lib/CMakeLists.txt
+++ b/src/dbus-lib/CMakeLists.txt
@@ -52,7 +52,7 @@ qtam_internal_add_dbus_adaptor(AppManDBusPrivate
         -i dbus-utilities.h
 )
 
-if (QT_FEATURE_installer)
+if (QT_FEATURE_am_installer)
     qtam_internal_add_dbus_adaptor(AppManDBusPrivate
         DBUS_ADAPTOR_SOURCES
             io.qt.packagemanager.xml
diff --git a/src/launcher-lib/CMakeLists.txt b/src/launcher-lib/CMakeLists.txt
index 12e77a68..bac50ba3 100644
--- a/src/launcher-lib/CMakeLists.txt
+++ b/src/launcher-lib/CMakeLists.txt
@@ -38,7 +38,7 @@ qt_internal_add_module(AppManLauncherPrivate
         Qt::QuickPrivate
 )
 
-qt_internal_extend_target(AppManLauncherPrivate CONDITION QT_FEATURE_widgets_support AND TARGET Qt::Widgets
+qt_internal_extend_target(AppManLauncherPrivate CONDITION QT_FEATURE_am_widgets_support AND TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
diff --git a/src/main-lib/CMakeLists.txt b/src/main-lib/CMakeLists.txt
index 6f3d1126..4eab9378 100644
--- a/src/main-lib/CMakeLists.txt
+++ b/src/main-lib/CMakeLists.txt
@@ -37,18 +37,18 @@ qt_internal_add_module(AppManMainPrivate
         Qt::AppManWindowPrivate
 )
 
-qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_widgets_support AND TARGET Qt::Widgets
+qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_am_widgets_support AND TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_internal_extend_target(AppManMainPrivate CONDITION TARGET Qt::DBus AND QT_FEATURE_external_dbus_interfaces
+qt_internal_extend_target(AppManMainPrivate CONDITION TARGET Qt::DBus AND QT_FEATURE_am_external_dbus_interfaces
     PUBLIC_LIBRARIES
         Qt::DBus
         Qt::AppManDBusPrivate
 )
 
-qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_installer
+qt_internal_extend_target(AppManMainPrivate CONDITION QT_FEATURE_am_installer
     PUBLIC_LIBRARIES
         Qt::AppManPackagePrivate
 )
diff --git a/src/manager-lib/CMakeLists.txt b/src/manager-lib/CMakeLists.txt
index 45852406..99e34462 100644
--- a/src/manager-lib/CMakeLists.txt
+++ b/src/manager-lib/CMakeLists.txt
@@ -58,7 +58,7 @@ qt_internal_add_module(AppManManagerPrivate
         Qt::QuickPrivate
 )
 
-qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_multi_process
+qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_am_multi_process
     SOURCES
         nativeruntime.cpp nativeruntime.h nativeruntime_p.h
         processcontainer.cpp processcontainer.h
@@ -67,19 +67,19 @@ qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_multi_proces
         dl
 )
 
-if (QT_FEATURE_multi_process)
+if (QT_FEATURE_am_multi_process)
     qtam_internal_add_dbus_adaptor(AppManManagerPrivate
         DBUS_ADAPTOR_SOURCES
             ../dbus-lib/io.qt.applicationmanager.intentinterface.xml
     )
 endif()
 
-qt_internal_extend_target(AppManManagerPrivate CONDITION (TARGET Qt::WaylandCompositor OR QT_FEATURE_installer)
+qt_internal_extend_target(AppManManagerPrivate CONDITION (TARGET Qt::WaylandCompositor OR QT_FEATURE_am_installer)
     SOURCES
         sudo.cpp sudo.h
 )
 
-qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_installer
+qt_internal_extend_target(AppManManagerPrivate CONDITION QT_FEATURE_am_installer
     SOURCES
         deinstallationtask.cpp deinstallationtask.h
         installationtask.cpp installationtask.h
diff --git a/src/package-lib/CMakeLists.txt b/src/package-lib/CMakeLists.txt
index 6f6fbab3..1130f09f 100644
--- a/src/package-lib/CMakeLists.txt
+++ b/src/package-lib/CMakeLists.txt
@@ -26,12 +26,12 @@ qt_internal_add_module(AppManPackagePrivate
         Qt::Network
 )
 
-qt_internal_extend_target(AppManPackagePrivate CONDITION QT_FEATURE_system_libarchive
+qt_internal_extend_target(AppManPackagePrivate CONDITION QT_FEATURE_am_system_libarchive
     LIBRARIES
         WrapLibArchive::WrapLibArchive
 )
 
-qt_internal_extend_target(AppManPackagePrivate CONDITION NOT QT_FEATURE_system_libarchive
+qt_internal_extend_target(AppManPackagePrivate CONDITION NOT QT_FEATURE_am_system_libarchive
     LIBRARIES
         Qt::BundledLibArchive
 )
diff --git a/src/package-lib/configure.cmake b/src/package-lib/configure.cmake
index e4b58d81..a08321ff 100644
--- a/src/package-lib/configure.cmake
+++ b/src/package-lib/configure.cmake
@@ -11,7 +11,7 @@ qt_find_package(WrapLibArchive PROVIDED_TARGETS WrapLibArchive::WrapLibArchive M
 
 #### Features
 
-qt_feature("system-libarchive" PRIVATE
+qt_feature("am-system-libarchive" PRIVATE
     LABEL "Using system libarchive"
     CONDITION WrapLibArchive_FOUND
     ENABLE INPUT_libarchive STREQUAL 'system'
@@ -19,5 +19,5 @@ qt_feature("system-libarchive" PRIVATE
 )
 
 qt_configure_add_summary_section(NAME "Qt Application Manager [Packaging module]")
-qt_configure_add_summary_entry(ARGS "system-libarchive")
+qt_configure_add_summary_entry(ARGS "am-system-libarchive")
 qt_configure_end_summary_section() # end of "Qt ApplicationManger" section
diff --git a/src/window-lib/CMakeLists.txt b/src/window-lib/CMakeLists.txt
index 3b0b647d..f959ebf2 100644
--- a/src/window-lib/CMakeLists.txt
+++ b/src/window-lib/CMakeLists.txt
@@ -32,7 +32,7 @@ qt_internal_add_module(AppManWindowPrivate
         Qt::Quick
 )
 
-if(QT_FEATURE_multi_process)
+if(QT_FEATURE_am_multi_process)
 
     qt6_generate_wayland_protocol_server_sources(AppManWindowPrivate
         FILES
@@ -49,7 +49,7 @@ if(QT_FEATURE_multi_process)
     )
 endif()
 
-qt_internal_extend_target(AppManWindowPrivate CONDITION QT_FEATURE_touch_emulation
+qt_internal_extend_target(AppManWindowPrivate CONDITION QT_FEATURE_am_touch_emulation
     SOURCES
         touchemulation_x11.cpp touchemulation_x11_p.h
     LIBRARIES
diff --git a/src/window-lib/configure.cmake b/src/window-lib/configure.cmake
index 76822c57..d22f31d5 100644
--- a/src/window-lib/configure.cmake
+++ b/src/window-lib/configure.cmake
@@ -8,22 +8,22 @@ find_package(X11)
 
 #### Features
 
-qt_feature("touch-emulation" PRIVATE
+qt_feature("am-touch-emulation" PRIVATE
     LABEL "Touch emulation support on X11"
     CONDITION X11_Xi_FOUND AND LINUX
     EMIT_IF LINUX
 )
-qt_feature_definition("touch-emulation" "AM_ENABLE_TOUCH_EMULATION")
+qt_feature_definition("am-touch-emulation" "AM_ENABLE_TOUCH_EMULATION")
 
-qt_feature("widgets-support" PRIVATE PUBLIC
+qt_feature("am-widgets-support" PRIVATE PUBLIC
     LABEL "Enable support for Qt widgets"
     CONDITION INPUT_widgets_support STREQUAL 'yes' AND TARGET Qt::Widgets
 )
-qt_feature_definition("widgets-support" "AM_WIDGETS_SUPPORT")
+qt_feature_definition("am-widgets-support" "AM_WIDGETS_SUPPORT")
 
 qt_configure_add_summary_section(NAME "Qt Application Manager [Window module]")
-qt_configure_add_summary_entry(ARGS "touch-emulation")
-qt_configure_add_summary_entry(ARGS "widgets-support")
+qt_configure_add_summary_entry(ARGS "am-touch-emulation")
+qt_configure_add_summary_entry(ARGS "am-widgets-support")
 qt_configure_end_summary_section() # end of "Qt ApplicationManger" section
 
 qt_extra_definition("AM_VERSION" "\"${PROJECT_VERSION}\"" PUBLIC)