1 files changed, 3 insertions, 21 deletions
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 426741a61..d28306197 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -55,12 +55,9 @@
 #include <Qt3DCore/private/qpostman_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/private/qservicelocator_p.h>
+#include <Qt3DCore/private/qsysteminformationservice_p.h>
 #include <Qt3DCore/qt3dcore-config.h>
 
-#if QT_CONFIG(qt3d_profile_jobs)
-#include <Qt3DCore/private/aspectcommanddebugger_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 namespace{
@@ -122,9 +119,6 @@ QAspectEnginePrivate::QAspectEnginePrivate()
     , m_scene(nullptr)
     , m_initialized(false)
     , m_runMode(QAspectEngine::Automatic)
-    #if QT_CONFIG(qt3d_profile_jobs)
-    , m_commandDebugger(new Debug::AspectCommandDebugger(q_func()))
-    #endif
 {
     qRegisterMetaType<Qt3DCore::QAbstractAspect *>();
     qRegisterMetaType<Qt3DCore::QObserverInterface *>();
@@ -276,10 +270,6 @@ void QAspectEnginePrivate::initialize()
     arbiter->setScene(m_scene);
     m_initialized = true;
     m_aspectManager->setPostConstructorInit(m_scene->postConstructorInit());
-#if QT_CONFIG(qt3d_profile_jobs)
-    m_commandDebugger->setAspectEngine(q_func());
-    m_commandDebugger->initialize();
-#endif
 }
 
 /*!
@@ -419,16 +409,8 @@ QVariant QAspectEngine::executeCommand(const QString &command)
         if (d->m_aspects.isEmpty())
             return QLatin1String("No loaded aspect");
 
-        QString reply;
-        reply += QLatin1String("Loaded aspects:");
-        for (QAbstractAspect *aspect : qAsConst(d->m_aspects)) {
-            const QString name = d->m_factory.aspectName(aspect);
-            if (!name.isEmpty())
-                reply += QLatin1String("\n * ") + name;
-            else
-                reply += QLatin1String("\n * <unnamed>");
-        }
-        return reply;
+        const QStringList names = d->m_aspectManager->serviceLocator()->systemInformation()->aspectNames();
+        return names.join(QLatin1String("\n"));
     }
 
     QStringList args = command.split(QLatin1Char(' '));