diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-04-22 14:19:30 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-04-22 13:37:38 +0000 |
| commit | e2a30c0c183bdeeda5d44d35e48b4e8ceee39cf3 (patch) | |
| tree | 12b0c19aa5e7c6df12002ea43be66cd5e89ea0db /src | |
| parent | a8bd8bb5b36b9e4079c9557ea45d8af974387e33 (diff) | |
Make componentChecker warnings optional.
To enable them export the following environment variable:
QT_LOGGING_RULES=ifw.componentChecker=true
Change-Id: Ied6744c745ca3fd0840c622c71a8ba30ad22e3d9
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/componentchecker.cpp | 2 | ||||
| -rw-r--r-- | src/libs/installer/componentchecker.h | 4 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 | ||||
| -rw-r--r-- | src/sdk/installerbase.cpp | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/libs/installer/componentchecker.cpp b/src/libs/installer/componentchecker.cpp index ee13664ee..381d0d1f5 100644 --- a/src/libs/installer/componentchecker.cpp +++ b/src/libs/installer/componentchecker.cpp @@ -40,6 +40,8 @@ namespace QInstaller { +Q_LOGGING_CATEGORY(componentChecker, "ifw.componentChecker") + QStringList ComponentChecker::checkComponent(Component *component) { QStringList checkResult; diff --git a/src/libs/installer/componentchecker.h b/src/libs/installer/componentchecker.h index 84c4e3d14..252a04f6c 100644 --- a/src/libs/installer/componentchecker.h +++ b/src/libs/installer/componentchecker.h @@ -37,8 +37,12 @@ #include "installer_global.h" #include <QCoreApplication> +#include <QLoggingCategory> + namespace QInstaller { +Q_DECLARE_LOGGING_CATEGORY(componentChecker) + class Component; class INSTALLER_EXPORT ComponentChecker diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index b03d11da3..9fef0575a 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -395,7 +395,7 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash<QString, Component*> &c foreach (QInstaller::Component *component, components) { const QStringList warnings = ComponentChecker::checkComponent(component); foreach (const QString &warning, warnings) - qWarning() << warning; + qCWarning(componentChecker) << warning; } } catch (const Error &error) { clearAllComponentLists(); diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index d2fb82562..7d0b4c58e 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -59,6 +59,7 @@ #include <QTemporaryFile> #include <QTranslator> #include <QUuid> +#include <QLoggingCategory> InstallerBase::InstallerBase(int &argc, char *argv[]) : SDKApp<QApplication>(argc, argv) @@ -74,6 +75,8 @@ InstallerBase::~InstallerBase() int InstallerBase::run() { + QLoggingCategory::setFilterRules(QLatin1String("ifw.componentChecker = false")); + KDRunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp1234865.lock")); if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::Lockfile)) { // It is possible to install an application and thus the maintenance tool into a |