From ef4f690cefdb90801a494f2210385adf7ff7c7c2 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 15 May 2024 15:10:16 +0200 Subject: [PATCH] AppStatisticsMonitor: Add to qbs build Drive-by changes to follow common patterns. Amends de18097cb42dc74ac60bdf1904514f82eb6c9364. Change-Id: I05e1e28a0ca080cd28c55aa3b8d88a66b7e8dbcf Reviewed-by: hjk --- .../appstatisticsmonitor/appstatisticsmonitor.qbs | 10 +++------- .../appstatisticsmonitorplugin.cpp | 2 +- .../{tr.h => appstatisticsmonitortr.h} | 0 src/plugins/plugins.qbs | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-) rename src/plugins/appstatisticsmonitor/{tr.h => appstatisticsmonitortr.h} (100%) diff --git a/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs b/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs index ae8ff235fdc..3905a41a0aa 100644 --- a/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs +++ b/src/plugins/appstatisticsmonitor/appstatisticsmonitor.qbs @@ -1,21 +1,17 @@ -import qbs 1.0 - QtcPlugin { name: "AppStatisticsMonitor" Depends { name: "Core" } Depends { name: "ProjectExplorer" } - Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } files: [ "appstatisticsmonitorplugin.cpp", + "appstatisticsmonitortr.h", "chart.h", "chart.cpp", - "manager.h", - "manager.cpp", "idataprovider.h", "idataprovider.cpp", - "tr.h" + "manager.h", + "manager.cpp", ] } - diff --git a/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp b/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp index 4b83334cf2e..e91822e1102 100644 --- a/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp +++ b/src/plugins/appstatisticsmonitor/appstatisticsmonitorplugin.cpp @@ -29,4 +29,4 @@ void AppStatisticsMonitorPlugin::initialize() } // namespace AppStatisticsMonitor::Internal -#include +#include "appstatisticsmonitorplugin.moc" diff --git a/src/plugins/appstatisticsmonitor/tr.h b/src/plugins/appstatisticsmonitor/appstatisticsmonitortr.h similarity index 100% rename from src/plugins/appstatisticsmonitor/tr.h rename to src/plugins/appstatisticsmonitor/appstatisticsmonitortr.h diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs index b16970c07c6..7293d34d683 100644 --- a/src/plugins/plugins.qbs +++ b/src/plugins/plugins.qbs @@ -5,6 +5,7 @@ Project { references: [ "android/android.qbs", + "appstatisticsmonitor/appstatisticsmonitor.qbs", "autotest/autotest.qbs", "autotoolsprojectmanager/autotoolsprojectmanager.qbs", "axivion/axivion.qbs", @@ -74,6 +75,7 @@ Project { "qnx/qnx.qbs", "qmakeprojectmanager/qmakeprojectmanager.qbs", "qmldesignerbase/qmldesignerbase.qbs", + "qtapplicationmanager/qtapplicationmanager.qbs", "qtsupport/qtsupport.qbs", "remotelinux/remotelinux.qbs", "resourceeditor/resourceeditor.qbs", @@ -94,6 +96,5 @@ Project { "vcsbase/vcsbase.qbs", "webassembly/webassembly.qbs", "welcome/welcome.qbs", - "qtapplicationmanager/qtapplicationmanager.qbs", ].concat(project.additionalPlugins) }