From bdc2b4b59f982eb0a92a19b86b374a669036c913 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 12 Oct 2018 09:33:30 +0300 Subject: 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 Reviewed-by: Kai Koehne Reviewed-by: hjk --- src/app/main.cpp | 2 -- src/libs/clangsupport/clangsupportdebugutils.cpp | 2 +- src/libs/extensionsystem/pluginmanager.cpp | 2 +- src/libs/qmljs/qmljscodeformatter.cpp | 2 +- src/libs/qmljs/qmljsicons.cpp | 2 +- src/libs/qmljs/qmljsimportdependencies.cpp | 2 +- src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 2 +- src/libs/qmljs/qmljssimplereader.cpp | 2 +- src/libs/ssh/sshlogging.cpp | 2 +- src/libs/utils/benchmarker.cpp | 2 +- src/libs/utils/fileinprojectfinder.cpp | 2 +- src/plugins/android/androidavdmanager.cpp | 2 +- src/plugins/android/androidbuildapkstep.cpp | 2 +- src/plugins/android/androidconfigurations.cpp | 2 +- src/plugins/android/androiddebugsupport.cpp | 2 +- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/android/androiddevice.cpp | 2 +- src/plugins/android/androidmanager.cpp | 2 +- src/plugins/android/androidrunner.cpp | 2 +- src/plugins/android/androidrunnerworker.cpp | 2 +- src/plugins/android/androidsdkmanager.cpp | 2 +- src/plugins/android/androidsdkmanagerwidget.cpp | 2 +- src/plugins/android/androidtoolmanager.cpp | 2 +- src/plugins/autotest/testcodeparser.cpp | 2 +- src/plugins/autotest/testconfiguration.cpp | 2 +- src/plugins/autotest/testframeworkmanager.cpp | 2 +- src/plugins/clangcodemodel/clangbackendlogging.cpp | 2 +- src/plugins/clangcodemodel/clanghoverhandler.cpp | 2 +- src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp | 2 +- src/plugins/clangtools/clangfixitsrefactoringchanges.cpp | 2 +- src/plugins/clangtools/clangtidyclazyrunner.cpp | 2 +- src/plugins/clangtools/clangtoolruncontrol.cpp | 2 +- src/plugins/clangtools/clangtoolrunner.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakecbpparser.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp | 2 +- src/plugins/cmakeprojectmanager/servermode.cpp | 2 +- src/plugins/coreplugin/documentmanager.cpp | 2 +- src/plugins/cpptools/builtineditordocumentprocessor.cpp | 2 +- src/plugins/cpptools/cppsemanticinfoupdater.cpp | 2 +- src/plugins/cpptools/cppsourceprocessor.cpp | 2 +- src/plugins/cpptools/generatedcodemodelsupport.cpp | 4 ++-- src/plugins/cpptools/semantichighlighter.cpp | 2 +- src/plugins/debugger/qml/qmlinspectoragent.cpp | 2 +- src/plugins/ios/iosbuildsettingswidget.cpp | 2 +- src/plugins/ios/iosconfigurations.cpp | 4 ++-- src/plugins/ios/iosdevice.cpp | 2 +- src/plugins/ios/iosplugin.cpp | 2 +- src/plugins/ios/iosprobe.cpp | 2 +- src/plugins/ios/iostoolhandler.cpp | 2 +- src/plugins/ios/simulatorcontrol.cpp | 2 +- src/plugins/ios/simulatoroperationdialog.cpp | 2 +- src/plugins/languageclient/baseclient.cpp | 4 ++-- src/plugins/languageclient/languageclientcodeassist.cpp | 2 +- src/plugins/modeleditor/modelindexer.cpp | 2 +- src/plugins/projectexplorer/gcctoolchain.cpp | 2 +- src/plugins/projectexplorer/projectimporter.cpp | 2 +- src/plugins/projectexplorer/projectmodels.cpp | 2 +- src/plugins/projectexplorer/runconfiguration.cpp | 2 +- src/plugins/qbsprojectmanager/qbspmlogging.cpp | 2 +- src/plugins/qmakeprojectmanager/makefileparse.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 2 +- src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 2 +- src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp | 2 +- src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp | 2 +- .../components/propertyeditor/propertyeditorqmlbackend.cpp | 2 +- src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp | 2 +- .../qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp | 2 +- src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 4 ++-- src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 +- src/plugins/qmldesigner/designercore/model/viewmanager.cpp | 2 +- src/plugins/qmldesigner/documentmanager.cpp | 2 +- src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 +- src/plugins/qtsupport/qscxmlcgenerator.cpp | 2 +- src/plugins/vcsbase/vcsbaseplugin.cpp | 6 +++--- src/tools/clangbackend/clangbackendmain.cpp | 2 -- src/tools/clangbackend/source/clangcodemodelserver.cpp | 2 +- src/tools/clangbackend/source/clangiasyncjob.cpp | 2 +- src/tools/clangbackend/source/clangtranslationunits.cpp | 2 +- src/tools/clangbackend/source/clangtranslationunitupdater.cpp | 2 +- src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp | 2 -- src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp | 2 -- tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp | 1 - tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp | 1 - tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp | 1 - tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp | 1 - tests/manual/clang-format-for-qtc/test.cpp | 2 +- tests/unit/unittest/unittests-main.cpp | 2 -- 87 files changed, 84 insertions(+), 98 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 045add4fbe..9c61cb323d 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -414,8 +414,6 @@ int main(int argc, char **argv) Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + "/" + Core::Constants::IDE_CASED_ID + "-XXXXXX"); - QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false\nqtc.*.info=false")); - #ifdef Q_OS_MAC // increase the number of file that can be opened in Qt Creator. struct rlimit rl; diff --git a/src/libs/clangsupport/clangsupportdebugutils.cpp b/src/libs/clangsupport/clangsupportdebugutils.cpp index 0d82b9133b..ff357b512f 100644 --- a/src/libs/clangsupport/clangsupportdebugutils.cpp +++ b/src/libs/clangsupport/clangsupportdebugutils.cpp @@ -37,7 +37,7 @@ namespace { -Q_LOGGING_CATEGORY(timersLog, "qtc.clangbackend.timers"); +Q_LOGGING_CATEGORY(timersLog, "qtc.clangbackend.timers", QtWarningMsg); class DebugInspectionDir : public QTemporaryDir { diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index b6ee6afa11..956f6f01eb 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -61,7 +61,7 @@ #include -Q_LOGGING_CATEGORY(pluginLog, "qtc.extensionsystem") +Q_LOGGING_CATEGORY(pluginLog, "qtc.extensionsystem", QtWarningMsg) const char C_IGNORED_PLUGINS[] = "Plugins/Ignored"; const char C_FORCEENABLED_PLUGINS[] = "Plugins/ForceEnabled"; diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index 973338395c..af940938c9 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -30,7 +30,7 @@ #include #include -static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter") +static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter", QtWarningMsg) namespace QmlJS { diff --git a/src/libs/qmljs/qmljsicons.cpp b/src/libs/qmljs/qmljsicons.cpp index 58eeae732a..71ab381108 100644 --- a/src/libs/qmljs/qmljsicons.cpp +++ b/src/libs/qmljs/qmljsicons.cpp @@ -40,7 +40,7 @@ enum { debug = false }; -static Q_LOGGING_CATEGORY(iconsLog, "qtc.qmljs.icons") +static Q_LOGGING_CATEGORY(iconsLog, "qtc.qmljs.icons", QtWarningMsg) namespace QmlJS { diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp index 7fc81ee15d..adc9c9ff57 100644 --- a/src/libs/qmljs/qmljsimportdependencies.cpp +++ b/src/libs/qmljs/qmljsimportdependencies.cpp @@ -35,7 +35,7 @@ #include -static Q_LOGGING_CATEGORY(importsLog, "qtc.qmljs.imports") +static Q_LOGGING_CATEGORY(importsLog, "qtc.qmljs.imports", QtWarningMsg) namespace QmlJS { diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 95fc125d7c..1f478f6d0e 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -54,7 +54,7 @@ namespace QmlJS { -QMLJS_EXPORT Q_LOGGING_CATEGORY(qmljsLog, "qtc.qmljs.common") +QMLJS_EXPORT Q_LOGGING_CATEGORY(qmljsLog, "qtc.qmljs.common", QtWarningMsg) /*! \class QmlJS::ModelManagerInterface diff --git a/src/libs/qmljs/qmljssimplereader.cpp b/src/libs/qmljs/qmljssimplereader.cpp index bdc686a524..bc67bf8f62 100644 --- a/src/libs/qmljs/qmljssimplereader.cpp +++ b/src/libs/qmljs/qmljssimplereader.cpp @@ -34,7 +34,7 @@ #include #include -static Q_LOGGING_CATEGORY(simpleReaderLog, "qtc.qmljs.simpleReader") +static Q_LOGGING_CATEGORY(simpleReaderLog, "qtc.qmljs.simpleReader", QtWarningMsg) namespace QmlJS{ diff --git a/src/libs/ssh/sshlogging.cpp b/src/libs/ssh/sshlogging.cpp index 9a72ff92c2..d5cfbbca33 100644 --- a/src/libs/ssh/sshlogging.cpp +++ b/src/libs/ssh/sshlogging.cpp @@ -27,6 +27,6 @@ namespace QSsh { namespace Internal { -Q_LOGGING_CATEGORY(sshLog, "qtc.ssh") +Q_LOGGING_CATEGORY(sshLog, "qtc.ssh", QtWarningMsg) } // namespace Internal } // namespace QSsh diff --git a/src/libs/utils/benchmarker.cpp b/src/libs/utils/benchmarker.cpp index 3603f02043..2918b97f6a 100644 --- a/src/libs/utils/benchmarker.cpp +++ b/src/libs/utils/benchmarker.cpp @@ -29,7 +29,7 @@ #include #include -static Q_LOGGING_CATEGORY(benchmarksLog, "qtc.benchmark"); +static Q_LOGGING_CATEGORY(benchmarksLog, "qtc.benchmark", QtWarningMsg); namespace Utils { diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index 22cd7111e7..33a779a91d 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -37,7 +37,7 @@ #include namespace { -Q_LOGGING_CATEGORY(finderLog, "qtc.utils.fileinprojectfinder"); +Q_LOGGING_CATEGORY(finderLog, "qtc.utils.fileinprojectfinder", QtWarningMsg); } namespace Utils { diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index cbe5dba2eb..77f4959015 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -42,7 +42,7 @@ #include namespace { -Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager") +Q_LOGGING_CATEGORY(avdManagerLog, "qtc.android.avdManager", QtWarningMsg) } namespace Android { diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index d095a96061..20b8e73876 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -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 { diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index de738bee30..b342053644 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -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 { diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 9636c68ac7..03f322ba78 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -48,7 +48,7 @@ #include namespace { -Q_LOGGING_CATEGORY(androidDebugSupportLog, "qtc.android.run.androiddebugsupport") +Q_LOGGING_CATEGORY(androidDebugSupportLog, "qtc.android.run.androiddebugsupport", QtWarningMsg) } using namespace Debugger; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 767ea101b2..d49971115c 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -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"); diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index cc108e6ca4..b6bc2a5864 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -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 { diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index df678d1f74..eb453c7476 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -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) diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 6e876aa548..f20f834c60 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -45,7 +45,7 @@ #include namespace { -Q_LOGGING_CATEGORY(androidRunnerLog, "qtc.android.run.androidrunner") +Q_LOGGING_CATEGORY(androidRunnerLog, "qtc.android.run.androidrunner", QtWarningMsg) } using namespace ProjectExplorer; diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 648a0d363d..87e4a5c36d 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -52,7 +52,7 @@ #include namespace { -Q_LOGGING_CATEGORY(androidRunWorkerLog, "qtc.android.run.androidrunnerworker") +Q_LOGGING_CATEGORY(androidRunWorkerLog, "qtc.android.run.androidrunnerworker", QtWarningMsg) } using namespace std; diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 5cd9ebdd85..d293960b62 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -41,7 +41,7 @@ #include namespace { -Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager") +Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager", QtWarningMsg) } namespace Android { diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp index 665d7dfdd2..bd255b5ef8 100644 --- a/src/plugins/android/androidsdkmanagerwidget.cpp +++ b/src/plugins/android/androidsdkmanagerwidget.cpp @@ -44,7 +44,7 @@ #include namespace { -Q_LOGGING_CATEGORY(androidSdkMgrUiLog, "qtc.android.sdkManagerUi") +Q_LOGGING_CATEGORY(androidSdkMgrUiLog, "qtc.android.sdkManagerUi", QtWarningMsg) } namespace Android { diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp index c36480a3c3..0186444e99 100644 --- a/src/plugins/android/androidtoolmanager.cpp +++ b/src/plugins/android/androidtoolmanager.cpp @@ -35,7 +35,7 @@ #include namespace { -Q_LOGGING_CATEGORY(androidToolLog, "qtc.android.sdkManager") +Q_LOGGING_CATEGORY(androidToolLog, "qtc.android.sdkManager", QtWarningMsg) } namespace Android { diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index b1cdac3a92..1449816fc0 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -49,7 +49,7 @@ #include #include -static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.testcodeparser") +static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.testcodeparser", QtWarningMsg) namespace Autotest { namespace Internal { diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index ece34ead49..1f9b73e77c 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -41,7 +41,7 @@ #include -static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.testconfiguration") +static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.testconfiguration", QtWarningMsg) using namespace ProjectExplorer; diff --git a/src/plugins/autotest/testframeworkmanager.cpp b/src/plugins/autotest/testframeworkmanager.cpp index 07a898b7c8..e96ee536ff 100644 --- a/src/plugins/autotest/testframeworkmanager.cpp +++ b/src/plugins/autotest/testframeworkmanager.cpp @@ -40,7 +40,7 @@ #include #include -static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.frameworkmanager") +static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.frameworkmanager", QtWarningMsg) namespace Autotest { namespace Internal { diff --git a/src/plugins/clangcodemodel/clangbackendlogging.cpp b/src/plugins/clangcodemodel/clangbackendlogging.cpp index 47118ca22d..e7074fe041 100644 --- a/src/plugins/clangcodemodel/clangbackendlogging.cpp +++ b/src/plugins/clangcodemodel/clangbackendlogging.cpp @@ -28,7 +28,7 @@ namespace ClangCodeModel { namespace Internal { -Q_LOGGING_CATEGORY(ipcLog, "qtc.clangcodemodel.ipc") +Q_LOGGING_CATEGORY(ipcLog, "qtc.clangcodemodel.ipc", QtWarningMsg) } // namespace Internal } // namespace ClangCodeModel diff --git a/src/plugins/clangcodemodel/clanghoverhandler.cpp b/src/plugins/clangcodemodel/clanghoverhandler.cpp index 3817f82f0a..c48655c0a9 100644 --- a/src/plugins/clangcodemodel/clanghoverhandler.cpp +++ b/src/plugins/clangcodemodel/clanghoverhandler.cpp @@ -40,7 +40,7 @@ #include #include -Q_LOGGING_CATEGORY(hoverLog, "qtc.clangcodemodel.hover"); +Q_LOGGING_CATEGORY(hoverLog, "qtc.clangcodemodel.hover", QtWarningMsg); using namespace TextEditor; diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp index 26399fe771..f607b9aa7a 100644 --- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp +++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp @@ -61,7 +61,7 @@ using namespace ClangCodeModel; using namespace ClangCodeModel::Internal; using namespace ProjectExplorer; -static Q_LOGGING_CATEGORY(debug, "qtc.clangcodemodel.batch"); +static Q_LOGGING_CATEGORY(debug, "qtc.clangcodemodel.batch", QtWarningMsg); static int timeOutFromEnvironmentVariable() { diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp index 26089ea930..ca06bf684c 100644 --- a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp +++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp @@ -35,7 +35,7 @@ #include -Q_LOGGING_CATEGORY(fixitsLog, "qtc.clangtools.fixits"); +Q_LOGGING_CATEGORY(fixitsLog, "qtc.clangtools.fixits", QtWarningMsg); using namespace Utils; diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp index d91724392e..eab10ebc60 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp @@ -37,7 +37,7 @@ #include #include -static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runner") +static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runner", QtWarningMsg) namespace ClangTools { namespace Internal { diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 8423d6771c..05f44f6213 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -70,7 +70,7 @@ using namespace CppTools; using namespace ProjectExplorer; using namespace Utils; -static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runcontrol") +static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runcontrol", QtWarningMsg) static QStringList splitArgs(QString &argsString) { diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index f7b48a1d6a..227a94c50d 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -38,7 +38,7 @@ #include #include -static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runner") +static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.runner", QtWarningMsg) namespace ClangTools { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp index 2f14ac45df..724fbb0e73 100644 --- a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp +++ b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp @@ -60,7 +60,7 @@ int distance(const FileName &targetDirectory, const FileName &fileName) // compiler flags void CMakeCbpParser::sortFiles() { - QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping"); + QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping", QtWarningMsg); FileNameList fileNames = transform(m_fileList, &FileNode::filePath); sort(fileNames); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index b5291273a1..272522ecff 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -50,7 +50,7 @@ using namespace QtSupport; namespace { -Q_LOGGING_CATEGORY(cmInputLog, "qtc.cmake.import"); +Q_LOGGING_CATEGORY(cmInputLog, "qtc.cmake.import", QtWarningMsg); struct CMakeToolChainData { diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp index 2fe3d894e2..8e21749927 100644 --- a/src/plugins/cmakeprojectmanager/servermode.cpp +++ b/src/plugins/cmakeprojectmanager/servermode.cpp @@ -57,7 +57,7 @@ const char HANDSHAKE_TYPE[] = "handshake"; const char START_MAGIC[] = "\n[== \"CMake Server\" ==[\n"; const char END_MAGIC[] = "\n]== \"CMake Server\" ==]\n"; -Q_LOGGING_CATEGORY(cmakeServerMode, "qtc.cmake.serverMode"); +Q_LOGGING_CATEGORY(cmakeServerMode, "qtc.cmake.serverMode", QtWarningMsg); // ---------------------------------------------------------------------- // Helpers: diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 5297d5132f..95da306aca 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -65,7 +65,7 @@ #include #include -Q_LOGGING_CATEGORY(log, "qtc.core.documentmanager") +Q_LOGGING_CATEGORY(log, "qtc.core.documentmanager", QtWarningMsg) /*! \class Core::DocumentManager diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp index ce282e3685..684f765eac 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp +++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp @@ -47,7 +47,7 @@ #include #include -static Q_LOGGING_CATEGORY(log, "qtc.cpptools.builtineditordocumentprocessor") +static Q_LOGGING_CATEGORY(log, "qtc.cpptools.builtineditordocumentprocessor", QtWarningMsg) namespace { diff --git a/src/plugins/cpptools/cppsemanticinfoupdater.cpp b/src/plugins/cpptools/cppsemanticinfoupdater.cpp index 6df0c69b15..5913c808cf 100644 --- a/src/plugins/cpptools/cppsemanticinfoupdater.cpp +++ b/src/plugins/cpptools/cppsemanticinfoupdater.cpp @@ -42,7 +42,7 @@ enum { debug = 0 }; using namespace CPlusPlus; using namespace CppTools; -static Q_LOGGING_CATEGORY(log, "qtc.cpptools.semanticinfoupdater") +static Q_LOGGING_CATEGORY(log, "qtc.cpptools.semanticinfoupdater", QtWarningMsg) namespace CppTools { diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index 11f266b6a5..2259b01f78 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -58,7 +58,7 @@ using namespace CppTools::Internal; typedef Document::DiagnosticMessage Message; -static Q_LOGGING_CATEGORY(log, "qtc.cpptools.sourceprocessor") +static Q_LOGGING_CATEGORY(log, "qtc.cpptools.sourceprocessor", QtWarningMsg) namespace { diff --git a/src/plugins/cpptools/generatedcodemodelsupport.cpp b/src/plugins/cpptools/generatedcodemodelsupport.cpp index 386f80b91e..80209bd243 100644 --- a/src/plugins/cpptools/generatedcodemodelsupport.cpp +++ b/src/plugins/cpptools/generatedcodemodelsupport.cpp @@ -73,7 +73,7 @@ GeneratedCodeModelSupport::GeneratedCodeModelSupport(CppModelManager *modelmanag CppTools::AbstractEditorSupport(modelmanager, generator), m_generatedFileName(generatedFile), m_generator(generator) { - QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport"); + QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport", QtWarningMsg); qCDebug(log) << "ctor GeneratedCodeModelSupport for" << m_generator->source() << generatedFile; @@ -86,7 +86,7 @@ GeneratedCodeModelSupport::~GeneratedCodeModelSupport() { CppTools::CppModelManager::instance()->emitAbstractEditorSupportRemoved( m_generatedFileName.toString()); - QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport"); + QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport", QtWarningMsg); qCDebug(log) << "dtor ~generatedcodemodelsupport for" << m_generatedFileName; } diff --git a/src/plugins/cpptools/semantichighlighter.cpp b/src/plugins/cpptools/semantichighlighter.cpp index 798e536477..8d49cea122 100644 --- a/src/plugins/cpptools/semantichighlighter.cpp +++ b/src/plugins/cpptools/semantichighlighter.cpp @@ -40,7 +40,7 @@ using namespace TextEditor; using SemanticHighlighter::incrementalApplyExtraAdditionalFormats; using SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd; -static Q_LOGGING_CATEGORY(log, "qtc.cpptools.semantichighlighter") +static Q_LOGGING_CATEGORY(log, "qtc.cpptools.semantichighlighter", QtWarningMsg) namespace CppTools { diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index de47d33eff..288ff845fb 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -59,7 +59,7 @@ using namespace QmlDebug::Constants; namespace Debugger { namespace Internal { -Q_LOGGING_CATEGORY(qmlInspectorLog, "qtc.dbg.qmlinspector") +Q_LOGGING_CATEGORY(qmlInspectorLog, "qtc.dbg.qmlinspector", QtWarningMsg) /*! * DebuggerAgent updates the watchhandler with the object tree data. diff --git a/src/plugins/ios/iosbuildsettingswidget.cpp b/src/plugins/ios/iosbuildsettingswidget.cpp index 8a74c5a2ed..8b417ab390 100644 --- a/src/plugins/ios/iosbuildsettingswidget.cpp +++ b/src/plugins/ios/iosbuildsettingswidget.cpp @@ -47,7 +47,7 @@ namespace Ios { namespace Internal { namespace { -Q_LOGGING_CATEGORY(iosSettingsLog, "qtc.ios.common") +Q_LOGGING_CATEGORY(iosSettingsLog, "qtc.ios.common", QtWarningMsg) } static const int IdentifierRole = Qt::UserRole+1; diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index ecddb7df50..dbc6673f75 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -71,8 +71,8 @@ using namespace Utils; using namespace Debugger; namespace { -Q_LOGGING_CATEGORY(kitSetupLog, "qtc.ios.kitSetup") -Q_LOGGING_CATEGORY(iosCommonLog, "qtc.ios.common") +Q_LOGGING_CATEGORY(kitSetupLog, "qtc.ios.kitSetup", QtWarningMsg) +Q_LOGGING_CATEGORY(iosCommonLog, "qtc.ios.common", QtWarningMsg) } using ToolChainPair = std::pair; diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index 00dd86b64c..2dc406c27a 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -49,7 +49,7 @@ using namespace ProjectExplorer; namespace { -Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect") +Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect", QtWarningMsg) } #ifdef Q_OS_MAC diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp index 0cc72a27b5..89ce3be3e1 100644 --- a/src/plugins/ios/iosplugin.cpp +++ b/src/plugins/ios/iosplugin.cpp @@ -53,7 +53,7 @@ using namespace QtSupport; namespace Ios { namespace Internal { -Q_LOGGING_CATEGORY(iosLog, "qtc.ios.common") +Q_LOGGING_CATEGORY(iosLog, "qtc.ios.common", QtWarningMsg) class IosPluginPrivate { diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index 7391255cb9..35bcaff544 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -33,7 +33,7 @@ #include #include -static Q_LOGGING_CATEGORY(probeLog, "qtc.ios.probe") +static Q_LOGGING_CATEGORY(probeLog, "qtc.ios.probe", QtWarningMsg) namespace Ios { diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 0ca710bda9..99d87fee4f 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -58,7 +58,7 @@ #include #include -static Q_LOGGING_CATEGORY(toolHandlerLog, "qtc.ios.toolhandler") +static Q_LOGGING_CATEGORY(toolHandlerLog, "qtc.ios.toolhandler", QtWarningMsg) namespace Ios { diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 723f17e95c..f3f048d02e 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -47,7 +47,7 @@ using namespace std; namespace { -Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator") +Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator", QtWarningMsg) } namespace Ios { diff --git a/src/plugins/ios/simulatoroperationdialog.cpp b/src/plugins/ios/simulatoroperationdialog.cpp index 818b588194..88ce5d48a6 100644 --- a/src/plugins/ios/simulatoroperationdialog.cpp +++ b/src/plugins/ios/simulatoroperationdialog.cpp @@ -34,7 +34,7 @@ #include namespace { -Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common") +Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg) } namespace Ios { diff --git a/src/plugins/languageclient/baseclient.cpp b/src/plugins/languageclient/baseclient.cpp index 6683172f20..3b134c1936 100644 --- a/src/plugins/languageclient/baseclient.cpp +++ b/src/plugins/languageclient/baseclient.cpp @@ -58,8 +58,8 @@ using namespace Utils; namespace LanguageClient { -static Q_LOGGING_CATEGORY(LOGLSPCLIENT, "qtc.languageclient.client"); -static Q_LOGGING_CATEGORY(LOGLSPCLIENTV, "qtc.languageclient.messages"); +static Q_LOGGING_CATEGORY(LOGLSPCLIENT, "qtc.languageclient.client", QtWarningMsg); +static Q_LOGGING_CATEGORY(LOGLSPCLIENTV, "qtc.languageclient.messages", QtWarningMsg); BaseClient::BaseClient() : m_id(Core::Id::fromString(QUuid::createUuid().toString())) diff --git a/src/plugins/languageclient/languageclientcodeassist.cpp b/src/plugins/languageclient/languageclientcodeassist.cpp index e0b3ca835a..63691b04ca 100644 --- a/src/plugins/languageclient/languageclientcodeassist.cpp +++ b/src/plugins/languageclient/languageclientcodeassist.cpp @@ -43,7 +43,7 @@ #include #include -static Q_LOGGING_CATEGORY(LOGLSPCOMPLETION, "qtc.languageclient.completion"); +static Q_LOGGING_CATEGORY(LOGLSPCOMPLETION, "qtc.languageclient.completion", QtWarningMsg); using namespace LanguageServerProtocol; diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index aa84b68954..3fa1703ea9 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -551,7 +551,7 @@ void ModelIndexer::removeDiagramReferenceFile(const QString &file, const QLoggingCategory &ModelIndexer::logger() { - static const QLoggingCategory category("qtc.modeleditor.modelindexer"); + static const QLoggingCategory category("qtc.modeleditor.modelindexer", QtWarningMsg); return category; } diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 390ce5706d..1af06a98ed 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -56,7 +56,7 @@ #include namespace { -Q_LOGGING_CATEGORY(gccLog, "qtc.projectexplorer.toolchain.gcc"); +Q_LOGGING_CATEGORY(gccLog, "qtc.projectexplorer.toolchain.gcc", QtWarningMsg); } // namespace using namespace Utils; diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index d766f7965a..2d4489c225 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -88,7 +88,7 @@ QList ProjectImporter::import(const Utils::FileName &importPath, bo { QList result; - const QLoggingCategory log("qtc.projectexplorer.import"); + const QLoggingCategory log("qtc.projectexplorer.import", QtWarningMsg); qCDebug(log) << "ProjectImporter::import" << importPath << silent; QFileInfo fi = importPath.toFileInfo(); diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index a4d9e39d9b..c009925c97 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -470,7 +470,7 @@ Node *FlatModel::nodeForIndex(const QModelIndex &index) const const QLoggingCategory &FlatModel::logger() { - static QLoggingCategory logger("qtc.projectexplorer.flatmodel"); + static QLoggingCategory logger("qtc.projectexplorer.flatmodel", QtWarningMsg); return logger; } diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 32dd8e460b..e6f0302bdf 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -66,7 +66,7 @@ using namespace Utils; using namespace ProjectExplorer::Internal; namespace { -Q_LOGGING_CATEGORY(statesLog, "qtc.projectmanager.states") +Q_LOGGING_CATEGORY(statesLog, "qtc.projectmanager.states", QtWarningMsg) } namespace ProjectExplorer { diff --git a/src/plugins/qbsprojectmanager/qbspmlogging.cpp b/src/plugins/qbsprojectmanager/qbspmlogging.cpp index e630981b29..c0ca210394 100644 --- a/src/plugins/qbsprojectmanager/qbspmlogging.cpp +++ b/src/plugins/qbsprojectmanager/qbspmlogging.cpp @@ -27,6 +27,6 @@ namespace QbsProjectManager { namespace Internal { -Q_LOGGING_CATEGORY(qbsPmLog, "qtc.qbspm") +Q_LOGGING_CATEGORY(qbsPmLog, "qtc.qbspm", QtWarningMsg) } } diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index 6eda5cbfdb..b73c75244e 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -349,7 +349,7 @@ BaseQtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(BaseQtVersi const QLoggingCategory &MakeFileParse::logging() { - static const QLoggingCategory category("qtc.qmakeprojectmanager.import"); + static const QLoggingCategory category("qtc.qmakeprojectmanager.import", QtWarningMsg); return category; } diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index cc26d880e2..53cb741e7e 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -96,7 +96,7 @@ private: namespace QmakeProjectManager { -Q_LOGGING_CATEGORY(qmakeParse, "qtc.qmake.parsing"); +Q_LOGGING_CATEGORY(qmakeParse, "qtc.qmake.parsing", QtWarningMsg); uint qHash(Variable key, uint seed) { return ::qHash(static_cast(key), seed); } diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 2629250ee7..0737e2ab45 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -38,7 +38,7 @@ #include #include -static Q_LOGGING_CATEGORY(dragToolInfo, "qtc.qmldesigner.formeditor"); +static Q_LOGGING_CATEGORY(dragToolInfo, "qtc.qmldesigner.formeditor", QtWarningMsg); namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index 57a280d72b..0de06fc360 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -42,7 +42,7 @@ #include -static Q_LOGGING_CATEGORY(moveManipulatorInfo, "qtc.qmldesigner.formeditor"); +static Q_LOGGING_CATEGORY(moveManipulatorInfo, "qtc.qmldesigner.formeditor", QtWarningMsg); namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index ed36dd4a04..0a8f5bf0a5 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -42,7 +42,7 @@ #include #include -static Q_LOGGING_CATEGORY(itemlibraryPopulate, "qtc.itemlibrary.populate") +static Q_LOGGING_CATEGORY(itemlibraryPopulate, "qtc.itemlibrary.populate", QtWarningMsg) static bool inline registerItemLibrarySortedModel() { qmlRegisterType(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 60723c9f34..b0bebdcd5c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -49,7 +49,7 @@ #include -static Q_LOGGING_CATEGORY(propertyEditorBenchmark, "qtc.propertyeditor.load") +static Q_LOGGING_CATEGORY(propertyEditorBenchmark, "qtc.propertyeditor.load", QtWarningMsg) static QmlJS::SimpleReaderNode::Ptr s_templateConfiguration = QmlJS::SimpleReaderNode::Ptr(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp index 7777f3202c..94b89efcd9 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp @@ -34,7 +34,7 @@ #include -static Q_LOGGING_CATEGORY(qmlRewriter, "qtc.rewriter.qmlrewriter") +static Q_LOGGING_CATEGORY(qmlRewriter, "qtc.rewriter.qmlrewriter", QtWarningMsg) using namespace QmlDesigner::Internal; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index c75c8a6401..609db1fe95 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -85,7 +85,7 @@ namespace QmlDesigner { -static Q_LOGGING_CATEGORY(instanceViewBenchmark, "qtc.nodeinstances.init") +static Q_LOGGING_CATEGORY(instanceViewBenchmark, "qtc.nodeinstances.init", QtWarningMsg) void NodeInstanceServerProxy::showCannotConnectToPuppetWarningAndSwitchToEditMode() { diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 5d80e5fa88..0dce2b2a10 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -65,8 +65,8 @@ #include #include -static Q_LOGGING_CATEGORY(puppetStart, "qtc.puppet.start") -static Q_LOGGING_CATEGORY(puppetBuild, "qtc.puppet.build") +static Q_LOGGING_CATEGORY(puppetStart, "qtc.puppet.start", QtWarningMsg) +static Q_LOGGING_CATEGORY(puppetBuild, "qtc.puppet.build", QtWarningMsg) namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index c168eed504..125c6d12bd 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -64,7 +64,7 @@ using namespace LanguageUtils; using namespace QmlJS; -static Q_LOGGING_CATEGORY(rewriterBenchmark, "qtc.rewriter.load") +static Q_LOGGING_CATEGORY(rewriterBenchmark, "qtc.rewriter.load", QtWarningMsg) namespace { diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index 3c35c36f84..0f09922997 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -52,7 +52,7 @@ namespace QmlDesigner { -static Q_LOGGING_CATEGORY(viewBenchmark, "qtc.viewmanager.attach") +static Q_LOGGING_CATEGORY(viewBenchmark, "qtc.viewmanager.attach", QtWarningMsg) class ViewManagerData { diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index a03a247cf4..7ce3bf7c4d 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -54,7 +54,7 @@ namespace QmlDesigner { -Q_LOGGING_CATEGORY(documentManagerLog, "qtc.qtquickdesigner.documentmanager") +Q_LOGGING_CATEGORY(documentManagerLog, "qtc.qtquickdesigner.documentmanager", QtWarningMsg) static inline QmlDesigner::DesignDocument* designDocument() { diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 2c745b2ce8..877010a3b7 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -70,7 +70,7 @@ #include #include -Q_LOGGING_CATEGORY(qmldesignerLog, "qtc.qmldesigner") +Q_LOGGING_CATEGORY(qmldesignerLog, "qtc.qmldesigner", QtWarningMsg) using namespace QmlDesigner::Internal; diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp index d015d9d445..f9e4c3c455 100644 --- a/src/plugins/qtsupport/qscxmlcgenerator.cpp +++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp @@ -38,7 +38,7 @@ using namespace ProjectExplorer; namespace QtSupport { -static QLoggingCategory log("qtc.qscxmlcgenerator"); +static QLoggingCategory log("qtc.qscxmlcgenerator", QtWarningMsg); static const char TaskCategory[] = "Task.Category.ExtraCompiler.QScxmlc"; QScxmlcGenerator::QScxmlcGenerator(const Project *project, diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index af2c5e753d..2d70846c34 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -59,9 +59,9 @@ using namespace Utils; using namespace ProjectExplorer; namespace { -Q_LOGGING_CATEGORY(baseLog, "qtc.vcs.base") -Q_LOGGING_CATEGORY(findRepoLog, "qtc.vcs.find-repo") -Q_LOGGING_CATEGORY(stateLog, "qtc.vcs.state") +Q_LOGGING_CATEGORY(baseLog, "qtc.vcs.base", QtWarningMsg) +Q_LOGGING_CATEGORY(findRepoLog, "qtc.vcs.find-repo", QtWarningMsg) +Q_LOGGING_CATEGORY(stateLog, "qtc.vcs.state", QtWarningMsg) } /*! diff --git a/src/tools/clangbackend/clangbackendmain.cpp b/src/tools/clangbackend/clangbackendmain.cpp index 338fec7982..d165ebb6dd 100644 --- a/src/tools/clangbackend/clangbackendmain.cpp +++ b/src/tools/clangbackend/clangbackendmain.cpp @@ -69,8 +69,6 @@ int main(int argc, char *argv[]) #ifdef Q_OS_WIN qInstallMessageHandler(messageOutput); #endif - QLoggingCategory::setFilterRules(QStringLiteral("qtc.*.debug=false")); - QCoreApplication::setOrganizationName(QStringLiteral("QtProject")); QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org")); QCoreApplication::setApplicationName(QStringLiteral("ClangBackend")); diff --git a/src/tools/clangbackend/source/clangcodemodelserver.cpp b/src/tools/clangbackend/source/clangcodemodelserver.cpp index 5f63e21f1b..66caaf2b49 100644 --- a/src/tools/clangbackend/source/clangcodemodelserver.cpp +++ b/src/tools/clangbackend/source/clangcodemodelserver.cpp @@ -44,7 +44,7 @@ #include #include -Q_LOGGING_CATEGORY(serverLog, "qtc.clangbackend.server"); +Q_LOGGING_CATEGORY(serverLog, "qtc.clangbackend.server", QtWarningMsg); static bool useSupportiveTranslationUnit() { diff --git a/src/tools/clangbackend/source/clangiasyncjob.cpp b/src/tools/clangbackend/source/clangiasyncjob.cpp index c325c494c9..2ce218e99e 100644 --- a/src/tools/clangbackend/source/clangiasyncjob.cpp +++ b/src/tools/clangbackend/source/clangiasyncjob.cpp @@ -25,7 +25,7 @@ #include "clangiasyncjob.h" -Q_LOGGING_CATEGORY(jobsLog, "qtc.clangbackend.jobs"); +Q_LOGGING_CATEGORY(jobsLog, "qtc.clangbackend.jobs", QtWarningMsg); namespace ClangBackEnd { diff --git a/src/tools/clangbackend/source/clangtranslationunits.cpp b/src/tools/clangbackend/source/clangtranslationunits.cpp index f47513b6dc..f649775d16 100644 --- a/src/tools/clangbackend/source/clangtranslationunits.cpp +++ b/src/tools/clangbackend/source/clangtranslationunits.cpp @@ -35,7 +35,7 @@ #include #include -Q_LOGGING_CATEGORY(tuLog, "qtc.clangbackend.translationunits"); +Q_LOGGING_CATEGORY(tuLog, "qtc.clangbackend.translationunits", QtWarningMsg); namespace ClangBackEnd { diff --git a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp index c74e626ffb..a45a898738 100644 --- a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp +++ b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp @@ -32,7 +32,7 @@ #include -static Q_LOGGING_CATEGORY(verboseLibLog, "qtc.clangbackend.verboselib"); +static Q_LOGGING_CATEGORY(verboseLibLog, "qtc.clangbackend.verboselib", QtWarningMsg); static bool isVerboseModeEnabled() { diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp b/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp index d510427081..a0000c6429 100644 --- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp +++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp @@ -182,8 +182,6 @@ struct Data // because we have a cycle dependency int main(int argc, char *argv[]) { try { - //QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false")); - QCoreApplication::setOrganizationName(QStringLiteral("QtProject")); QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org")); QCoreApplication::setApplicationName(QStringLiteral("ClangPchManagerBackend")); diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp b/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp index 1fac050883..f83ddb5815 100644 --- a/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp +++ b/src/tools/clangrefactoringbackend/clangrefactoringbackendmain.cpp @@ -86,8 +86,6 @@ public: int main(int argc, char *argv[]) { try { - //QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false")); - QCoreApplication::setOrganizationName(QStringLiteral("QtProject")); QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org")); QCoreApplication::setApplicationName(QStringLiteral("ClangRefactoringBackend")); diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp index 28696e7349..14722c6d57 100644 --- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp +++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp @@ -76,7 +76,6 @@ static QString pluginFolder(const QLatin1String &folder) void tst_PluginManager::init() { - QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); m_pm = new PluginManager; m_pm->setPluginIID(QLatin1String("plugin")); m_objectAdded = new QSignalSpy(m_pm, SIGNAL(objectAdded(QObject*))); diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp index b277d77d80..c846458615 100644 --- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp +++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp @@ -90,7 +90,6 @@ private: void tst_PluginSpec::init() { - QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); QVERIFY(QDir::setCurrent(QLatin1String(PLUGINSPEC_DIR))); } diff --git a/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp b/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp index ef3575d77f..842cec7e4e 100644 --- a/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp +++ b/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp @@ -112,7 +112,6 @@ private: void tst_Dependencies::initTestCase() { - QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); m_path = QLatin1Literal(TESTSRCDIR "/samples"); m_basePaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)); diff --git a/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp b/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp index 447363de72..dcedd6df69 100644 --- a/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp +++ b/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp @@ -100,7 +100,6 @@ QString resourcePath() void tst_ImportCheck::initTestCase() { - QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); if (!ModelManagerInterface::instance()) new ModelManagerInterface; diff --git a/tests/manual/clang-format-for-qtc/test.cpp b/tests/manual/clang-format-for-qtc/test.cpp index 3edaa85739..e5afaff130 100644 --- a/tests/manual/clang-format-for-qtc/test.cpp +++ b/tests/manual/clang-format-for-qtc/test.cpp @@ -681,7 +681,7 @@ void extremeFunction3(int parameter1, // Misc // ------------------------------------------------------------------------------------------------- -static Q_LOGGING_CATEGORY(log, "qtc.cpptools.builtineditordocumentprocessor") +static Q_LOGGING_CATEGORY(log, "qtc.cpptools.builtineditordocumentprocessor", QtWarningMsg) int hello; // NOTE: Ops, awkward placement of next token after Q_LOGGING_CATEGORY (semicolon helps) diff --git a/tests/unit/unittest/unittests-main.cpp b/tests/unit/unittest/unittests-main.cpp index d8f0ce3100..f5eaa8846c 100644 --- a/tests/unit/unittest/unittests-main.cpp +++ b/tests/unit/unittest/unittests-main.cpp @@ -45,8 +45,6 @@ int main(int argc, char *argv[]) QCoreApplication application(argc, argv); - QLoggingCategory::setFilterRules(QStringLiteral("*.info=false\n*.debug=false\n*.warning=true")); - testing::InitGoogleTest(&argc, argv); #ifdef WITH_BENCHMARKS benchmark::Initialize(&argc, argv); -- cgit v1.2.3