Untangle the broken monitoring dependencies

After the last refactoring of the monitoring components, we ended up with
a monitor_lib that pulled in nearly all of the other AM components. The end
result was that the qml runtime had all the appman system-ui code compiled in
as well.

Downgraded the monitor_lib to just read values from the system and moved the
QML API classes to shared_main_lib, manager_lib and main_lib respectively.

Change-Id: Ic205153c6d8c221793b0f2546b2f31f4e1ede53d
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
 

31 files changed, 268 insertions, 119 deletions

diff --git a/src/main-lib/main-lib.pro b/src/main-lib/main-lib.pro
index c85d11e3..2e5184d2 100644
--- a/src/main-lib/main-lib.pro
+++ b/src/main-lib/main-lib.pro
@@ -31,13 +31,15 @@ DEFINES += AM_BUILD_DIR=\\\"$$BUILD_DIR\\\"
 cross_compile:DEFINES += AM_CROSS_COMPILED
 
 HEADERS += \
-    $$PWD/configuration.h \
-    $$PWD/main.h \
-    $$PWD/defaultconfiguration.h
+    configuration.h \
+    main.h \
+    defaultconfiguration.h \
+    windowframetimer.h \
 
 SOURCES += \
-    $$PWD/main.cpp \
-    $$PWD/configuration.cpp \
-    $$PWD/defaultconfiguration.cpp
+    main.cpp \
+    configuration.cpp \
+    defaultconfiguration.cpp \
+    windowframetimer.cpp \
 
 load(qt_module)
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 061e6399..3f87bed3 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -129,6 +129,7 @@
 #    include "windowmanagerdbuscontextadaptor.h"
 #  endif
 #  include "touchemulation.h"
+#  include "windowframetimer.h"
 #endif
 
 #include "configuration.h"
@@ -142,7 +143,6 @@
 
 // monitor-lib
 #include "cpustatus.h"
-#include "frametimer.h"
 #include "gpustatus.h"
 #include "iostatus.h"
 #include "memorystatus.h"
@@ -653,7 +653,7 @@ void Main::setupQmlEngine(const QStringList &importPaths, const QString &quickCo
 
     // monitor-lib
     qmlRegisterType<CpuStatus>("QtApplicationManager", 2, 0, "CpuStatus");
-    qmlRegisterType<FrameTimer>("QtApplicationManager", 2, 0, "FrameTimer");
+    qmlRegisterType<WindowFrameTimer>("QtApplicationManager", 2, 0, "FrameTimer");
     qmlRegisterType<GpuStatus>("QtApplicationManager", 2, 0, "GpuStatus");
     qmlRegisterType<IoStatus>("QtApplicationManager", 2, 0, "IoStatus");
     qmlRegisterType<MemoryStatus>("QtApplicationManager", 2, 0, "MemoryStatus");
diff --git a/src/main-lib/windowframetimer.cpp b/src/main-lib/windowframetimer.cpp
new file mode 100644
index 00000000..11cc342e
--- /dev/null
+++ b/src/main-lib/windowframetimer.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Luxoft Sweden AB
+** Copyright (C) 2018 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Luxoft Application Manager.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#include "windowframetimer.h"
+
+#include <qqmlinfo.h>
+
+#include "waylandwindow.h"
+#include "inprocesswindow.h"
+#include "qmlinprocessapplicationmanagerwindow.h"
+
+
+QT_BEGIN_NAMESPACE_AM
+
+WindowFrameTimer::WindowFrameTimer(QObject *parent)
+    : FrameTimer(parent)
+{ }
+
+bool WindowFrameTimer::connectToAppManWindow()
+{
+    if (qobject_cast<QmlInProcessApplicationManagerWindow *>(m_window.data())) {
+        qmlWarning(this) << "It makes no sense to measure the FPS of an application's window in single-process mode."
+                            " FrameTimer won't operate with the given window.";
+        return true;
+    }
+
+    Window *appManWindow = qobject_cast<Window*>(m_window.data());
+    if (!appManWindow)
+        return false;
+
+    if (qobject_cast<InProcessWindow*>(appManWindow)) {
+        qmlWarning(this) << "It makes no sense to measure the FPS of a WindowObject in single-process mode."
+                            " FrameTimer won't operate with the given window.";
+        return true;
+    }
+
+#if defined(AM_MULTI_PROCESS)
+    WaylandWindow *waylandWindow = qobject_cast<WaylandWindow*>(m_window);
+    Q_ASSERT(waylandWindow);
+
+    connect(waylandWindow, &WaylandWindow::waylandSurfaceChanged,
+            this, &WindowFrameTimer::connectToWaylandSurface, Qt::UniqueConnection);
+
+    connectToWaylandSurface();
+#endif
+
+    return true;
+}
+
+void WindowFrameTimer::disconnectFromAppManWindow()
+{
+#if defined(AM_MULTI_PROCESS)
+    disconnectFromWaylandSurface();
+#endif
+}
+
+#if defined(AM_MULTI_PROCESS)
+void WindowFrameTimer::connectToWaylandSurface()
+{
+    WaylandWindow *waylandWindow = qobject_cast<WaylandWindow*>(m_window);
+    Q_ASSERT(waylandWindow);
+
+    disconnectFromWaylandSurface();
+
+    m_waylandSurface = waylandWindow->waylandSurface();
+    if (m_waylandSurface)
+        connect(m_waylandSurface, &QWaylandQuickSurface::redraw, this, &WindowFrameTimer::newFrame, Qt::UniqueConnection);
+}
+
+void WindowFrameTimer::disconnectFromWaylandSurface()
+{
+    if (!m_waylandSurface)
+        return;
+
+    disconnect(m_waylandSurface, nullptr, this, nullptr);
+
+    m_waylandSurface = nullptr;
+}
+#endif
+
+
+QT_END_NAMESPACE_AM
diff --git a/src/main-lib/windowframetimer.h b/src/main-lib/windowframetimer.h
new file mode 100644
index 00000000..e81d3386
--- /dev/null
+++ b/src/main-lib/windowframetimer.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 Luxoft Sweden AB
+** Copyright (C) 2018 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Luxoft Application Manager.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QtAppManSharedMain/frametimer.h>
+#include <QtAppManCommon/global.h>
+
+#if defined(AM_MULTI_PROCESS)
+#  include <QtWaylandCompositor/QWaylandQuickSurface>
+#endif
+
+QT_BEGIN_NAMESPACE_AM
+
+class WindowFrameTimer : public FrameTimer
+{
+    Q_OBJECT
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/FrameTimer 2.0")
+
+public:
+    WindowFrameTimer(QObject *parent = nullptr);
+
+protected:
+    bool connectToAppManWindow() override;
+    void disconnectFromAppManWindow() override;
+
+private:
+#if defined(AM_MULTI_PROCESS)
+    void disconnectFromWaylandSurface();
+    void connectToWaylandSurface();
+    QPointer<QWaylandQuickSurface> m_waylandSurface;
+#endif
+};
+
+QT_END_NAMESPACE_AM
diff --git a/src/manager-lib/manager-lib.pro b/src/manager-lib/manager-lib.pro
index 2cb8095c..7e357c28 100644
--- a/src/manager-lib/manager-lib.pro
+++ b/src/manager-lib/manager-lib.pro
@@ -13,6 +13,7 @@ QT_FOR_PRIVATE *= \
     appman_plugininterfaces-private \
     appman_intent_server-private \
     appman_intent_client-private \
+    appman_monitor-private \
 
 CONFIG *= static internal_module
 
@@ -51,13 +52,10 @@ HEADERS += \
     applicationipcinterface.h \
     applicationipcinterface_p.h \
     applicationmanager_p.h \
-    systemreader.h \
     debugwrapper.h \
     amnamespace.h \
-    intentaminterface.h
-
-linux:HEADERS += \
-    sysfsreader.h \
+    intentaminterface.h \
+    processstatus.h \
 
 !headless:HEADERS += \
     qmlinprocessapplicationmanagerwindow.h \
@@ -81,12 +79,9 @@ SOURCES += \
     quicklauncher.cpp \
     applicationipcmanager.cpp \
     applicationipcinterface.cpp \
-    systemreader.cpp \
     debugwrapper.cpp \
-    intentaminterface.cpp
-
-linux:SOURCES += \
-    sysfsreader.cpp \
+    intentaminterface.cpp \
+    processstatus.cpp \
 
 !headless:SOURCES += \
     qmlinprocessapplicationmanagerwindow.cpp \
diff --git a/src/monitor-lib/processstatus.cpp b/src/manager-lib/processstatus.cpp
index 89ab9b56..89ab9b56 100644
--- a/src/monitor-lib/processstatus.cpp
+++ b/src/manager-lib/processstatus.cpp
diff --git a/src/monitor-lib/processstatus.h b/src/manager-lib/processstatus.h
index b233aced..b233aced 100644
--- a/src/monitor-lib/processstatus.h
+++ b/src/manager-lib/processstatus.h
diff --git a/src/monitor-lib/monitor-lib.pro b/src/monitor-lib/monitor-lib.pro
index 792c85de..8d87e102 100644
--- a/src/monitor-lib/monitor-lib.pro
+++ b/src/monitor-lib/monitor-lib.pro
@@ -4,34 +4,25 @@ MODULE = appman_monitor
 
 load(am-config)
 
-QT = core qml
+QT = core gui
 
 QT_FOR_PRIVATE *= \
     appman_common-private \
-    appman_application-private \
-    appman_manager-private \
-    appman_window-private \
 
 CONFIG *= static internal_module
 
+linux:HEADERS += \
+    sysfsreader.h \
+
 HEADERS += \
-    cpustatus.h \
-    frametimer.h \
-    gpustatus.h \
-    iostatus.h \
-    memorystatus.h \
-    monitormodel.h \
+    systemreader.h \
     processreader.h \
-    processstatus.h \
+
+linux:SOURCES += \
+    sysfsreader.cpp \
 
 SOURCES += \
-    cpustatus.cpp \
-    frametimer.cpp \
-    gpustatus.cpp \
-    iostatus.cpp \
-    memorystatus.cpp \
-    monitormodel.cpp \
+    systemreader.cpp \
     processreader.cpp \
-    processstatus.cpp \
 
 load(qt_module)
diff --git a/src/monitor-lib/processreader.h b/src/monitor-lib/processreader.h
index 029292a6..e135101c 100644
--- a/src/monitor-lib/processreader.h
+++ b/src/monitor-lib/processreader.h
@@ -50,7 +50,7 @@
 
 #if defined(Q_OS_LINUX)
 #  include <QScopedPointer>
-#  include <QtAppManManager/sysfsreader.h>
+#  include <QtAppManMonitor/sysfsreader.h>
 #endif
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/manager-lib/sysfsreader.cpp b/src/monitor-lib/sysfsreader.cpp
index d100dc43..d100dc43 100644
--- a/src/manager-lib/sysfsreader.cpp
+++ b/src/monitor-lib/sysfsreader.cpp
diff --git a/src/manager-lib/sysfsreader.h b/src/monitor-lib/sysfsreader.h
index 8a299177..8a299177 100644
--- a/src/manager-lib/sysfsreader.h
+++ b/src/monitor-lib/sysfsreader.h
diff --git a/src/manager-lib/systemreader.cpp b/src/monitor-lib/systemreader.cpp
index cab1fa56..cab1fa56 100644
--- a/src/manager-lib/systemreader.cpp
+++ b/src/monitor-lib/systemreader.cpp
diff --git a/src/manager-lib/systemreader.h b/src/monitor-lib/systemreader.h
index fe7ff2bf..a6879495 100644
--- a/src/manager-lib/systemreader.h
+++ b/src/monitor-lib/systemreader.h
@@ -50,7 +50,7 @@
 
 #if defined(Q_OS_LINUX)
 #  include <QScopedPointer>
-#  include <QtAppManManager/sysfsreader.h>
+#  include <QtAppManMonitor/sysfsreader.h>
 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
 #endif
 
diff --git a/src/monitor-lib/cpustatus.cpp b/src/shared-main-lib/cpustatus.cpp
index d192781d..d192781d 100644
--- a/src/monitor-lib/cpustatus.cpp
+++ b/src/shared-main-lib/cpustatus.cpp
diff --git a/src/monitor-lib/cpustatus.h b/src/shared-main-lib/cpustatus.h
index 29308daf..f7e37867 100644
--- a/src/monitor-lib/cpustatus.h
+++ b/src/shared-main-lib/cpustatus.h
@@ -44,7 +44,7 @@
 
 #include <QtAppManCommon/global.h>
 
-#include <QtAppManManager/systemreader.h>
+#include <QtAppManMonitor/systemreader.h>
 
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/monitor-lib/frametimer.cpp b/src/shared-main-lib/frametimer.cpp
index 6d512393..1805f0ee 100644
--- a/src/monitor-lib/frametimer.cpp
+++ b/src/shared-main-lib/frametimer.cpp
@@ -45,9 +45,6 @@
 #include <QQuickWindow>
 #include <qqmlinfo.h>
 
-#include "waylandwindow.h"
-#include "inprocesswindow.h"
-
 /*!
     \qmltype FrameTimer
     \inqmlmodule QtApplicationManager
@@ -206,10 +203,7 @@ void FrameTimer::setWindow(QObject *value)
     if (m_window == value)
         return;
 
-#if defined(AM_MULTI_PROCESS)
-    disconnectFromWaylandSurface();
-#endif
-
+    disconnectFromAppManWindow();
     if (m_window)
         disconnect(m_window, nullptr, this, nullptr);
 
@@ -235,52 +229,12 @@ bool FrameTimer::connectToQuickWindow()
 
 bool FrameTimer::connectToAppManWindow()
 {
-    Window *appManWindow = qobject_cast<Window*>(m_window);
-    if (!appManWindow)
-        return false;
-
-    if (qobject_cast<InProcessWindow*>(appManWindow)) {
-        qmlWarning(this) << "It makes no sense to measure the FPS of a WindowObject in single-process mode."
-                            " FrameTimer won't operate with the given window.";
-        return true;
-    }
-
-#if defined(AM_MULTI_PROCESS)
-    WaylandWindow *waylandWindow = qobject_cast<WaylandWindow*>(m_window);
-    Q_ASSERT(waylandWindow);
-
-    connect(waylandWindow, &WaylandWindow::waylandSurfaceChanged,
-            this, &FrameTimer::connectToWaylandSurface, Qt::UniqueConnection);
-
-    connectToWaylandSurface();
-#endif
-
-    return true;
+    return false;
 }
 
-#if defined(AM_MULTI_PROCESS)
-void FrameTimer::connectToWaylandSurface()
-{
-    WaylandWindow *waylandWindow = qobject_cast<WaylandWindow*>(m_window);
-    Q_ASSERT(waylandWindow);
-
-    disconnectFromWaylandSurface();
 
-    m_waylandSurface = waylandWindow->waylandSurface();
-    if (m_waylandSurface)
-        connect(m_waylandSurface, &QWaylandQuickSurface::redraw, this, &FrameTimer::newFrame, Qt::UniqueConnection);
-}
-
-void FrameTimer::disconnectFromWaylandSurface()
-{
-    if (!m_waylandSurface)
-        return;
-
-    disconnect(m_waylandSurface, nullptr, this, nullptr);
-
-    m_waylandSurface = nullptr;
-}
-#endif
+void FrameTimer::disconnectFromAppManWindow()
+{ }
 
 /*!
     \qmlproperty list<string> FrameTimer::roleNames
diff --git a/src/monitor-lib/frametimer.h b/src/shared-main-lib/frametimer.h
index 65d1cee1..b7a00d78 100644
--- a/src/monitor-lib/frametimer.h
+++ b/src/shared-main-lib/frametimer.h
@@ -99,19 +99,18 @@ signals:
     void runningChanged();
     void windowChanged();
 
-private slots:
+protected slots:
     void newFrame();
 
+protected:
+    virtual bool connectToAppManWindow();
+    virtual void disconnectFromAppManWindow();
+
+    QPointer<QObject> m_window;
+
 private:
     void reset();
     bool connectToQuickWindow();
-    bool connectToAppManWindow();
-
-#if defined(AM_MULTI_PROCESS)
-    void disconnectFromWaylandSurface();
-    void connectToWaylandSurface();
-    QPointer<QWaylandQuickSurface> m_waylandSurface;
-#endif
 
     int m_count = 0;
     int m_sum = 0;
@@ -119,8 +118,6 @@ private:
     int m_max = 0;
     qreal m_jitter = 0.0;
 
-    QPointer<QObject> m_window;
-
     QElapsedTimer m_timer;
 
     QTimer m_updateTimer;
diff --git a/src/monitor-lib/gpustatus.cpp b/src/shared-main-lib/gpustatus.cpp
index efa7d2ad..efa7d2ad 100644
--- a/src/monitor-lib/gpustatus.cpp
+++ b/src/shared-main-lib/gpustatus.cpp
diff --git a/src/monitor-lib/gpustatus.h b/src/shared-main-lib/gpustatus.h
index 16f95077..9cc308b6 100644
--- a/src/monitor-lib/gpustatus.h
+++ b/src/shared-main-lib/gpustatus.h
@@ -44,7 +44,7 @@
 
 #include <QtAppManCommon/global.h>
 
-#include <QtAppManManager/systemreader.h>
+#include <QtAppManMonitor/systemreader.h>
 
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/monitor-lib/iostatus.cpp b/src/shared-main-lib/iostatus.cpp
index fba8fff6..fba8fff6 100644
--- a/src/monitor-lib/iostatus.cpp
+++ b/src/shared-main-lib/iostatus.cpp
diff --git a/src/monitor-lib/iostatus.h b/src/shared-main-lib/iostatus.h
index 5e5e5357..b6070fad 100644
--- a/src/monitor-lib/iostatus.h
+++ b/src/shared-main-lib/iostatus.h
@@ -49,7 +49,7 @@
 #include <QStringList>
 #include <QVariant>
 
-#include <QtAppManManager/systemreader.h>
+#include <QtAppManMonitor/systemreader.h>
 
 QT_BEGIN_NAMESPACE_AM
 
diff --git a/src/monitor-lib/memorystatus.cpp b/src/shared-main-lib/memorystatus.cpp
index 1b6909a7..1b6909a7 100644
--- a/src/monitor-lib/memorystatus.cpp
+++ b/src/shared-main-lib/memorystatus.cpp
diff --git a/src/monitor-lib/memorystatus.h b/src/shared-main-lib/memorystatus.h
index cd712b9c..716c9f82 100644
--- a/src/monitor-lib/memorystatus.h
+++ b/src/shared-main-lib/memorystatus.h
@@ -44,7 +44,7 @@
 
 #include <QtAppManCommon/global.h>
 
-#include <QtAppManManager/systemreader.h>
+#include <QtAppManMonitor/systemreader.h>
 
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/monitor-lib/monitormodel.cpp b/src/shared-main-lib/monitormodel.cpp
index 5dbda61d..5dbda61d 100644
--- a/src/monitor-lib/monitormodel.cpp
+++ b/src/shared-main-lib/monitormodel.cpp
diff --git a/src/monitor-lib/monitormodel.h b/src/shared-main-lib/monitormodel.h
index 5def27dd..5def27dd 100644
--- a/src/monitor-lib/monitormodel.h
+++ b/src/shared-main-lib/monitormodel.h
diff --git a/src/shared-main-lib/shared-main-lib.pro b/src/shared-main-lib/shared-main-lib.pro
index bbbb52c6..964f0d0c 100644
--- a/src/shared-main-lib/shared-main-lib.pro
+++ b/src/shared-main-lib/shared-main-lib.pro
@@ -5,18 +5,31 @@ MODULE = appman_shared_main
 load(am-config)
 
 QT = core network qml
-!headless:QT *= gui gui-private
+!headless:QT *= gui gui-private quick
 QT *= \
     appman_common-private \
+    appman_monitor-private \
 
 CONFIG *= static internal_module
 
 HEADERS += \
-    $$PWD/sharedmain.h \
-    $$PWD/qmllogger.h \
+    sharedmain.h \
+    qmllogger.h \
+    cpustatus.h \
+    frametimer.h \
+    gpustatus.h \
+    iostatus.h \
+    memorystatus.h \
+    monitormodel.h \
 
 SOURCES += \
-    $$PWD/sharedmain.cpp \
-    $$PWD/qmllogger.cpp \
+    sharedmain.cpp \
+    qmllogger.cpp \
+    cpustatus.cpp \
+    frametimer.cpp \
+    gpustatus.cpp \
+    iostatus.cpp \
+    memorystatus.cpp \
+    monitormodel.cpp \
 
 load(qt_module)
diff --git a/src/src.pro b/src/src.pro
index 480a19ab..c1b427ee 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -20,7 +20,7 @@ package_lib.subdir = package-lib
 package_lib.depends = crypto_lib application_lib
 
 manager_lib.subdir = manager-lib
-manager_lib.depends = application_lib notification_lib intent_server_lib intent_client_lib plugin_interfaces
+manager_lib.depends = application_lib notification_lib intent_server_lib intent_client_lib monitor_lib plugin_interfaces
 
 installer_lib.subdir = installer-lib
 installer_lib.depends = package_lib manager_lib
@@ -29,10 +29,10 @@ window_lib.subdir = window-lib
 window_lib.depends = manager_lib
 
 monitor_lib.subdir = monitor-lib
-monitor_lib.depends = manager_lib window_lib
+monitor_lib.depends = common_lib
 
 shared_main_lib.subdir = shared-main-lib
-shared_main_lib.depends = common_lib
+shared_main_lib.depends = common_lib monitor_lib
 
 intent_server_lib.subdir = intent-server-lib
 intent_server_lib.depends = common_lib
@@ -63,7 +63,7 @@ tools_testrunner.subdir = tools/testrunner
 tools_testrunner.depends = main_lib
 
 tools_dumpqmltypes.subdir = tools/dumpqmltypes
-tools_dumpqmltypes.depends = manager_lib installer_lib window_lib monitor_lib launcher_lib
+tools_dumpqmltypes.depends = manager_lib installer_lib window_lib shared_main_lib launcher_lib
 
 tools_packager.subdir = tools/packager
 tools_packager.depends = package_lib
diff --git a/src/tools/dumpqmltypes/dumpqmltypes.cpp b/src/tools/dumpqmltypes/dumpqmltypes.cpp
index 69ddde30..e91a5632 100644
--- a/src/tools/dumpqmltypes/dumpqmltypes.cpp
+++ b/src/tools/dumpqmltypes/dumpqmltypes.cpp
@@ -51,13 +51,13 @@
 #include <QtAppManIntentClient/intentclient.h>
 #include <QtAppManIntentClient/intentclientrequest.h>
 #include <QtAppManIntentClient/intenthandler.h>
-#include <QtAppManMonitor/cpustatus.h>
-#include <QtAppManMonitor/gpustatus.h>
-#include <QtAppManMonitor/memorystatus.h>
-#include <QtAppManMonitor/iostatus.h>
-#include <QtAppManMonitor/processstatus.h>
-#include <QtAppManMonitor/frametimer.h>
-#include <QtAppManMonitor/monitormodel.h>
+#include <QtAppManSharedMain/cpustatus.h>
+#include <QtAppManSharedMain/gpustatus.h>
+#include <QtAppManSharedMain/memorystatus.h>
+#include <QtAppManSharedMain/iostatus.h>
+#include <QtAppManManager/processstatus.h>
+#include <QtAppManSharedMain/frametimer.h>
+#include <QtAppManSharedMain/monitormodel.h>
 #include <QtAppManCommon/global.h>
 #include <QtAppManCommon/exception.h>
 
diff --git a/src/tools/dumpqmltypes/dumpqmltypes.pro b/src/tools/dumpqmltypes/dumpqmltypes.pro
index df2b92f9..22079782 100644
--- a/src/tools/dumpqmltypes/dumpqmltypes.pro
+++ b/src/tools/dumpqmltypes/dumpqmltypes.pro
@@ -17,6 +17,7 @@ QT *= \
     appman_intent_client-private \
     appman_intent_server-private \
     appman_monitor-private \
+    appman_shared_main-private \
 
 CONFIG *= console
 
diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp
index f59c4511..263a0f09 100644
--- a/src/tools/launcher-qml/launcher-qml.cpp
+++ b/src/tools/launcher-qml/launcher-qml.cpp
@@ -92,7 +92,7 @@
 #include "qml-utilities.h"
 #include "launcher-qml_p.h"
 
-// monitor-lib
+// shared-main-lib
 #include "cpustatus.h"
 #include "frametimer.h"
 #include "gpustatus.h"
diff --git a/src/tools/launcher-qml/launcher-qml.pro b/src/tools/launcher-qml/launcher-qml.pro
index dc246df2..31b35820 100644
--- a/src/tools/launcher-qml/launcher-qml.pro
+++ b/src/tools/launcher-qml/launcher-qml.pro
@@ -12,6 +12,7 @@ QT *= \
     appman_application-private \
     appman_plugininterfaces-private \
     appman_launcher-private \
+    appman_shared_main-private \
 
 HEADERS += \
     launcher-qml_p.h