forked from qt-creator/qt-creator
Remove hard-coded disabling of debug logs
Instead, set the default level of all logs to QtWarningMsg. The call to setFilterRules overrides the user preferences in qtlogging.ini. Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
a27d4e9455
commit
bdc2b4b59f
@@ -42,7 +42,7 @@
|
||||
#include <functional>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager")
|
||||
Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
@@ -68,7 +68,7 @@ using namespace ProjectExplorer;
|
||||
using namespace Android::Internal;
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(buildapkstepLog, "qtc.android.build.androidbuildapkstep")
|
||||
Q_LOGGING_CATEGORY(buildapkstepLog, "qtc.android.build.androidbuildapkstep", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
@@ -77,7 +77,7 @@ using namespace ProjectExplorer;
|
||||
using namespace Utils;
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(avdConfigLog, "qtc.android.androidconfig")
|
||||
Q_LOGGING_CATEGORY(avdConfigLog, "qtc.android.androidconfig", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <QHostAddress>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(androidDebugSupportLog, "qtc.android.run.androiddebugsupport")
|
||||
Q_LOGGING_CATEGORY(androidDebugSupportLog, "qtc.android.run.androiddebugsupport", QtWarningMsg)
|
||||
}
|
||||
|
||||
using namespace Debugger;
|
||||
|
||||
@@ -64,7 +64,7 @@ using namespace Android;
|
||||
using namespace Android::Internal;
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(deployStepLog, "qtc.android.build.androiddeployqtstep")
|
||||
Q_LOGGING_CATEGORY(deployStepLog, "qtc.android.build.androiddeployqtstep", QtWarningMsg)
|
||||
}
|
||||
|
||||
const QLatin1String UninstallPreviousPackageKey("UninstallPreviousPackage");
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(androidDeviceLog, "qtc.android.build.androiddevice")
|
||||
Q_LOGGING_CATEGORY(androidDeviceLog, "qtc.android.build.androiddevice", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace {
|
||||
const QString apkVersionRegEx("package: name=([\\=a-z\\d_\\.\\'\\s]*)"
|
||||
"\\sversionName='([\\d\\.]*)'");
|
||||
|
||||
Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager")
|
||||
Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg)
|
||||
|
||||
bool runCommand(const QString &executable, const QStringList &args,
|
||||
QString *output = nullptr, int timeoutS = 30)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <QLoggingCategory>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(androidRunnerLog, "qtc.android.run.androidrunner")
|
||||
Q_LOGGING_CATEGORY(androidRunnerLog, "qtc.android.run.androidrunner", QtWarningMsg)
|
||||
}
|
||||
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#include <chrono>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(androidRunWorkerLog, "qtc.android.run.androidrunnerworker")
|
||||
Q_LOGGING_CATEGORY(androidRunWorkerLog, "qtc.android.run.androidrunnerworker", QtWarningMsg)
|
||||
}
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <QSettings>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager")
|
||||
Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <QSortFilterProxyModel>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(androidSdkMgrUiLog, "qtc.android.sdkManagerUi")
|
||||
Q_LOGGING_CATEGORY(androidSdkMgrUiLog, "qtc.android.sdkManagerUi", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <QLoggingCategory>
|
||||
|
||||
namespace {
|
||||
Q_LOGGING_CATEGORY(androidToolLog, "qtc.android.sdkManager")
|
||||
Q_LOGGING_CATEGORY(androidToolLog, "qtc.android.sdkManager", QtWarningMsg)
|
||||
}
|
||||
|
||||
namespace Android {
|
||||
|
||||
Reference in New Issue
Block a user