From 17fa69eb4268efd63aeeb40bd11da959192f3d1c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 7 Oct 2018 22:39:00 +0300 Subject: [PATCH 01/16] Debugger: Translate user-visible strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8cd2c93bf6713cb1b5379228c700d36c3b71c261 Reviewed-by: André Hartmann Reviewed-by: Leena Miettinen Reviewed-by: hjk --- src/plugins/debugger/unstartedappwatcherdialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp index 703c1ea5ba1..9415c573550 100644 --- a/src/plugins/debugger/unstartedappwatcherdialog.cpp +++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp @@ -239,8 +239,7 @@ void UnstartedAppWatcherDialog::pidFound(const DeviceProcessItem &p) void UnstartedAppWatcherDialog::startStopWatching(bool start) { setWaitingState(start ? WatchingState : NotWatchingState); - m_watchingPushButton->setText(start ? QLatin1String("Stop Watching") - : QLatin1String("Start Watching")); + m_watchingPushButton->setText(start ? tr("Stop Watching") : tr("Start Watching")); startStopTimer(start); } From 81a4c1d934f649a892c5f1a56a85c1441ee0c7ee Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Fri, 12 Oct 2018 19:36:26 +0200 Subject: [PATCH 02/16] Git: Simplify conditions in BranchView index.isValid() is already checked in line 165, so it does not need to be checked afterwards because it is always true there. isLeaf is only used once, so join the assignment. Change-Id: I5f21486fd440b82d8e99be1248adf023da664c1e Reviewed-by: Orgad Shaneh --- src/plugins/git/branchview.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index 4619a21e7ec..11cbfcdbcf9 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -166,12 +166,10 @@ void BranchView::slotCustomContextMenu(const QPoint &point) return; const QModelIndex currentBranch = m_model->currentBranch(); - const bool hasSelection = index.isValid(); - const bool currentSelected = hasSelection && index == currentBranch; + const bool currentSelected = index == currentBranch; const bool isLocal = m_model->isLocal(index); - const bool isLeaf = m_model->isLeaf(index); const bool isTag = m_model->isTag(index); - const bool hasActions = hasSelection && isLeaf; + const bool hasActions = m_model->isLeaf(index); const bool currentLocal = m_model->isLocal(currentBranch); QMenu contextMenu; From 299c777c019fb9573b31034e3ca327e6ca59c500 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Fri, 12 Oct 2018 19:43:33 +0200 Subject: [PATCH 03/16] Git: Fix context menu actions in BranchViews second column m_branchView->indexAt(point) returned another model index [column 1] than m_model->currentBranch() [column 0], if the context menu was requested in thesecond (date/time) column. The failed comparison then gave a lot of invalid actions (like merge) for the current branch. Change-Id: Icefc084c81f9b573cd151460db793d3c5a01eb2b Reviewed-by: Orgad Shaneh --- src/plugins/git/branchview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index 11cbfcdbcf9..095cbcedcfa 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -166,7 +166,7 @@ void BranchView::slotCustomContextMenu(const QPoint &point) return; const QModelIndex currentBranch = m_model->currentBranch(); - const bool currentSelected = index == currentBranch; + const bool currentSelected = index.row() == currentBranch.row(); const bool isLocal = m_model->isLocal(index); const bool isTag = m_model->isTag(index); const bool hasActions = m_model->isLeaf(index); From 0138b734694668d922ae0278d713bfb614e6fc40 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 12 Oct 2018 08:33:47 +0300 Subject: [PATCH 04/16] VCS: Use category logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + clean the logs a bit. Change-Id: I5a196f7007eb2b76bcdce4b2ac152da84698b860 Reviewed-by: André Hartmann --- src/plugins/vcsbase/vcsbaseplugin.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 102f1ea39c7..dd5549f405d 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -57,7 +58,10 @@ using namespace Core; using namespace Utils; using namespace ProjectExplorer; -enum { debug = 0, debugRepositorySearch = 0 }; +namespace { +Q_LOGGING_CATEGORY(baseLog, "qtc.vcs.base") +Q_LOGGING_CATEGORY(findRepoLog, "qtc.vcs.find-repo") +} /*! \namespace VcsBase @@ -570,11 +574,10 @@ void VcsBasePlugin::extensionsInitialized() void VcsBasePlugin::slotSubmitEditorAboutToClose(VcsBaseSubmitEditor *submitEditor, bool *result) { - if (debug) - qDebug() << this << "plugin's submit editor" - << d->m_submitEditor << (d->m_submitEditor ? d->m_submitEditor->document()->id().name() : "") - << "closing submit editor" << submitEditor - << (submitEditor ? submitEditor->document()->id().name() : ""); + qCDebug(baseLog) << this << "plugin's submit editor" << d->m_submitEditor + << (d->m_submitEditor ? d->m_submitEditor->document()->id().name() : QByteArray()) + << "closing submit editor" << submitEditor + << (submitEditor ? submitEditor->document()->id().name() : QByteArray()); if (submitEditor == d->m_submitEditor) *result = submitEditorAboutToClose(); } @@ -613,8 +616,7 @@ const VcsBasePluginState &VcsBasePlugin::currentState() const bool VcsBasePlugin::enableMenuAction(ActionState as, QAction *menuAction) const { - if (debug) - qDebug() << "enableMenuAction" << menuAction->text() << as; + qCDebug(baseLog) << "enableMenuAction" << menuAction->text() << as; switch (as) { case NoVcsEnabled: { const bool supportsCreation = d->supportsRepositoryCreation(); @@ -727,8 +729,7 @@ bool VcsBasePlugin::raiseSubmitEditor() const QString VcsBasePlugin::findRepositoryForDirectory(const QString &dirS, const QString &checkFile) { - if (debugRepositorySearch) - qDebug() << ">VcsBasePlugin::findRepositoryForDirectory" << dirS << checkFile; + qCDebug(findRepoLog) << ">" << dirS << checkFile; QTC_ASSERT(!dirS.isEmpty() && !checkFile.isEmpty(), return QString()); const QString root = QDir::rootPath(); @@ -741,13 +742,11 @@ QString VcsBasePlugin::findRepositoryForDirectory(const QString &dirS, break; if (QFileInfo(directory, checkFile).isFile()) { - if (debugRepositorySearch) - qDebug() << " " << absDirPath; + qCDebug(findRepoLog) << "<" << absDirPath; return absDirPath; } } while (!directory.isRoot() && directory.cdUp()); - if (debugRepositorySearch) - qDebug() << " Date: Fri, 12 Oct 2018 08:49:01 +0300 Subject: [PATCH 05/16] VCS: Re-add state logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recovers logs that were removed in 05312bfeeccdc86fd51a4c5b8c9466337c40c36a. Change-Id: I4f433795917ee331623ead8f465ef26f53bed229 Reviewed-by: André Hartmann --- src/plugins/vcsbase/vcsbaseplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index dd5549f405d..af2c5e753dc 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -61,6 +61,7 @@ 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") } /*! @@ -326,6 +327,7 @@ void StateListener::slotStateChanged() if (!vc) state.clearPatchFile(); // Need a repository to patch + qCDebug(stateLog).noquote() << "VC:" << (vc ? vc->displayName() : QString("None")) << state; EditorManager::updateWindowTitles(); emit stateChanged(state, vc); } From bdc2b4b59f982eb0a92a19b86b374a669036c913 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 12 Oct 2018 09:33:30 +0300 Subject: [PATCH 06/16] 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 +- .../qmldesigner/components/formeditor/movemanipulator.cpp | 2 +- .../qmldesigner/components/itemlibrary/itemlibrarymodel.cpp | 2 +- .../components/propertyeditor/propertyeditorqmlbackend.cpp | 2 +- .../qmldesigner/designercore/filemanager/qmlrewriter.cpp | 2 +- .../designercore/instances/nodeinstanceserverproxy.cpp | 2 +- .../qmldesigner/designercore/instances/puppetcreator.cpp | 4 ++-- .../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 +- .../clangbackend/source/clangtranslationunitupdater.cpp | 2 +- .../clangpchmanagerbackend/clangpchmanagerbackendmain.cpp | 2 -- .../clangrefactoringbackend/clangrefactoringbackendmain.cpp | 2 -- .../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 045add4fbed..9c61cb323d9 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 0d82b9133ba..ff357b512f7 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 b6ee6afa11e..956f6f01eb5 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 973338395cf..af940938c93 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 58eeae732a7..71ab3811083 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 7fc81ee15d6..adc9c9ff57a 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 95fc125d7c0..1f478f6d0e2 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 bdc686a5245..bc67bf8f62a 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 9a72ff92c24..d5cfbbca334 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 3603f02043c..2918b97f6ad 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 22cd7111e7a..33a779a91d2 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 cbe5dba2ebf..77f4959015c 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 d095a96061b..20b8e73876a 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 de738bee302..b3420536449 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 9636c68ac7a..03f322ba784 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 767ea101b2a..d49971115ca 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 cc108e6ca4c..b6bc2a5864d 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 df678d1f741..eb453c7476b 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 6e876aa5481..f20f834c60b 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 648a0d363d4..87e4a5c36d9 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 5cd9ebdd856..d293960b627 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 665d7dfdd20..bd255b5ef89 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 c36480a3c31..0186444e990 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 b1cdac3a928..1449816fc0a 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 ece34ead496..1f9b73e77c0 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 07a898b7c80..e96ee536ffc 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 47118ca22d5..e7074fe0415 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 3817f82f0ad..c48655c0a92 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 26399fe7715..f607b9aa7a5 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 26089ea930b..ca06bf684c9 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 d91724392e1..eab10ebc607 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 8423d6771cf..05f44f62132 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 f7b48a1d6a5..227a94c50de 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 2f14ac45df9..724fbb0e737 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 b5291273a16..272522ecff6 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 2fe3d894e21..8e217499276 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 5297d5132fc..95da306aca0 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 ce282e3685d..684f765eace 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 6df0c69b157..5913c808cf0 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 11f266b6a5f..2259b01f787 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 386f80b91e3..80209bd2434 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 798e536477a..8d49cea1224 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 de47d33eff0..288ff845fb8 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 8a74c5a2ed2..8b417ab3905 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 ecddb7df500..dbc6673f75e 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 00dd86b64c3..2dc406c27aa 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 0cc72a27b59..89ce3be3e12 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 7391255cb96..35bcaff544d 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 0ca710bda97..99d87fee4f1 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 723f17e95c1..f3f048d02e1 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 818b5881941..88ce5d48a69 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 6683172f20c..3b134c19368 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 e0b3ca835ac..63691b04caa 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 aa84b689548..3fa1703ea9f 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 390ce5706dd..1af06a98ed3 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 d766f7965a6..2d4489c2252 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 a4d9e39d9b8..c009925c97e 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 32dd8e460b5..e6f0302bdf8 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 e630981b296..c0ca210394d 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 6eda5cbfdb7..b73c75244e2 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 cc26d880e2d..53cb741e7ee 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 2629250ee7a..0737e2ab450 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 57a280d72bb..0de06fc3608 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 ed36dd4a048..0a8f5bf0a58 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 60723c9f34a..b0bebdcd5cb 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 7777f3202c2..94b89efcd94 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 c75c8a64013..609db1fe952 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 5d80e5fa884..0dce2b2a105 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 c168eed504e..125c6d12bda 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 3c35c36f846..0f099229977 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 a03a247cf44..7ce3bf7c4db 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 2c745b2ce88..877010a3b72 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 d015d9d445f..f9e4c3c4555 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 af2c5e753dc..2d70846c34a 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 338fec79822..d165ebb6dd3 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 5f63e21f1bc..66caaf2b492 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 c325c494c9b..2ce218e99e6 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 f47513b6dca..f649775d162 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 c74e626ffbf..a45a8987387 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 d510427081e..a0000c6429e 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 1fac050883d..f83ddb58156 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 28696e73499..14722c6d57e 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 b277d77d804..c8464586152 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 ef3575d77f5..842cec7e4e8 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 447363de72f..dcedd6df69d 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 3edaa85739e..e5afaff1300 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 d8f0ce31005..f5eaa8846c2 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); From 892db36c2685a9f33ce22ab751bd94c46a6129e3 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 11 Oct 2018 20:52:09 +0200 Subject: [PATCH 07/16] Git: Update documentation for the branches side panel Change-Id: Iff10716debd4e24382ed52e288d04c2dbdd86b1f Reviewed-by: Leena Miettinen --- doc/src/vcs/creator-vcs-git.qdoc | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index 54d58e96710..aadc914bf5e 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -222,8 +222,10 @@ To work with Git branches, select \uicontrol {Branches}. The checked out branch is shown in bold and underlined in the list of branches in the - \uicontrol {Git Branches} sidebar view. Double-click local branch names to - edit them. + \uicontrol {Git Branches} sidebar view. + + For local and remote branches, the changes log can be shown by double + clicking on the branch name. To refresh the list of branches, click \inlineimage reload_gray.png (\uicontrol Refresh). @@ -244,7 +246,7 @@ \li Remove a local branch. You cannot delete remote branches. \row \li \uicontrol Rename - \li Rename a local branch. + \li Rename a local branch. You cannot rename remote branches. \row \li \uicontrol{Checkout} \li Check out the selected branch and make it current. You can stash @@ -281,6 +283,24 @@ \li Set the current branch to track the selected one. \endtable + The following additional context-menu operations are available for + \uicontrol{Remote Branches}. The context-menu can be opened on + \uicontrol{Remote Branches} or on a specific remote repository. + + \table + \header + \li Menu Item + \li Description + \row + \li \uicontrol{Fetch} + \li Fetches all the branches and changes information from a + specific remote repository, or from all remotes if applied + to \uicontrol {Remote Branches}. + \row + \li \uicontrol{Manage Remotes} + \li Opens the \uicontrol Remotes dialog. + \endtable + \section3 Configuring Merge Tools Only graphical merge tools are supported. You can configure the From bd6f30da700b43fb57f5df84b6028610fb7dbc0c Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 10 Oct 2018 15:48:55 +0200 Subject: [PATCH 08/16] Clang: Improve debug log message Change-Id: I82b8f4fc72614f6671815e3b1dbfad87a062ae98 Reviewed-by: Marco Bubke --- src/plugins/clangcodemodel/clangbackendreceiver.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangbackendreceiver.cpp b/src/plugins/clangcodemodel/clangbackendreceiver.cpp index cf113617c36..ec33cb2ae46 100644 --- a/src/plugins/clangcodemodel/clangbackendreceiver.cpp +++ b/src/plugins/clangcodemodel/clangbackendreceiver.cpp @@ -193,10 +193,11 @@ void BackendReceiver::completions(const CompletionsMessage &message) void BackendReceiver::annotations(const AnnotationsMessage &message) { - qCDebugIpc() << "AnnotationsMessage with" - << message.diagnostics.size() << "diagnostics" - << message.tokenInfos.size() << "highlighting marks" - << message.skippedPreprocessorRanges.size() << "skipped preprocessor ranges"; + qCDebugIpc() << "AnnotationsMessage" + << "for" << QFileInfo(message.fileContainer.filePath).fileName() << "with" + << message.diagnostics.size() << "diagnostics" << message.tokenInfos.size() + << "token infos" << message.skippedPreprocessorRanges.size() + << "skipped preprocessor ranges"; auto processor = ClangEditorDocumentProcessor::get(message.fileContainer.filePath); if (!processor) From b30f82d3fbb949203e0ab5332b4ae10c2b3b7edd Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 15 Oct 2018 08:30:11 +0200 Subject: [PATCH 09/16] LanguageClient: Sync settings on plugin initialization Otherwise we might end up starting a second language server when opening options page of Language Client plugin and closing again with 'Ok' without modifying any setting. Change-Id: I2b16436b92a0d622dc7df1b5fbdaf9f9f8e717a2 Reviewed-by: David Schulz --- src/plugins/languageclient/languageclientsettings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index 5fcd7b683ed..b2c6adc8ca0 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -216,6 +216,7 @@ void LanguageClientSettingsPage::init() { m_model.reset(LanguageClientSettings::fromSettings(Core::ICore::settings())); apply(); + finish(); } QWidget *LanguageClientSettingsPage::widget() From c67b2e84cc623d6ca92ac1f4933d5fe598f5efe6 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 15 Oct 2018 08:36:54 +0200 Subject: [PATCH 10/16] LanguageClient: Perform safe shutdown of clients This avoids running into a soft assert and is basically the common pattern used when shutting down the client. Change-Id: I9a2eea8d2ffe51f81d6bb78353606ef492628897 Reviewed-by: David Schulz --- src/plugins/languageclient/languageclientmanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index b3e034f1d7b..325f6e62241 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -214,8 +214,12 @@ void LanguageClientManager::shutdown() if (managerInstance->m_shuttingDown) return; managerInstance->m_shuttingDown = true; - for (auto interface : managerInstance->m_clients) - interface->shutdown(); + for (auto interface : managerInstance->m_clients) { + if (interface->reachable()) + interface->shutdown(); + else + deleteClient(interface); + } } LanguageClientManager *LanguageClientManager::instance() From fdde4529e8918defd6b90e38bb50c67b9650304d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 15 Oct 2018 08:39:38 +0200 Subject: [PATCH 11/16] LanguageClient: Fix condition Change-Id: I4978fb7d28789c3888aa521b5b400e1d79f31a91 Reviewed-by: David Schulz --- src/plugins/languageclient/baseclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/languageclient/baseclient.cpp b/src/plugins/languageclient/baseclient.cpp index 3b134c19368..e885454a4b1 100644 --- a/src/plugins/languageclient/baseclient.cpp +++ b/src/plugins/languageclient/baseclient.cpp @@ -759,7 +759,7 @@ StdIOClient::~StdIOClient() bool StdIOClient::start() { m_process.start(); - if (!m_process.waitForStarted() && m_process.state() != QProcess::Running) { + if (!m_process.waitForStarted() || m_process.state() != QProcess::Running) { setError(m_process.errorString()); return false; } From 922a363fb43fbedc37de7c0ffa8b937e1b12a800 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 12 Oct 2018 17:00:42 +0200 Subject: [PATCH 12/16] Botan: Enable optimizations in release mode Because we override the cxx flags manually to silence some warnings, we have to pass the -O flag too. On my machine, this results in a speed-up of factor four when uplading via SFTP. Change-Id: I3279f0cc95624530fdb5b7ea868a8a51962fb4f8 Reviewed-by: Eike Ziller --- src/libs/botan/botan.pro | 9 +++++++-- src/libs/botan/botan.qbs | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libs/botan/botan.pro b/src/libs/botan/botan.pro index ed5542a6f27..0f2f18b1812 100644 --- a/src/libs/botan/botan.pro +++ b/src/libs/botan/botan.pro @@ -33,9 +33,14 @@ msvc: BOTAN_CXX_FLAGS += /wd4100 /wd4800 /wd4127 /wd4244 /wd4250 /wd4267 /wd4334 else: BOTAN_CXX_FLAGS += -Wno-unused-parameter macos: BOTAN_CXX_FLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET -isysroot $$shell_quote($$QMAKE_MAC_SDK_PATH) unix: BOTAN_CXX_FLAGS += -fPIC -!isEmpty(BOTAN_CXX_FLAGS): OTHER_FLAGS += --cxxflags=$$shell_quote($$BOTAN_CXX_FLAGS) win32: OTHER_FLAGS += --link-method=hardlink -CONFIG(debug, debug|release): OTHER_FLAGS += --debug-mode +CONFIG(debug, debug|release) { + OTHER_FLAGS += --with-debug-info +} else { + msvc: BOTAN_CXX_FLAGS += /O2 + else: BOTAN_CXX_FLAGS += -O3 +} +!isEmpty(BOTAN_CXX_FLAGS): OTHER_FLAGS += --cxxflags=$$shell_quote($$BOTAN_CXX_FLAGS) CONFIGURE_FILE_PATH_FOR_SHELL = $$shell_quote($$shell_path($$BOTAN_SOURCE_DIR/configure.py)) configure_inputs = $$BOTAN_SOURCE_DIR/configure.py diff --git a/src/libs/botan/botan.qbs b/src/libs/botan/botan.qbs index e6a7369f368..004cdc2f2cd 100644 --- a/src/libs/botan/botan.qbs +++ b/src/libs/botan/botan.qbs @@ -42,7 +42,8 @@ Product { + "sha2_32,sha2_32_x86,sha2_64,simd,system_rng,emsa_pkcs1,pbes2,pbkdf2"; args.push("--enable-modules=" + modules); var cxxFlags = []; - if (product.qbs.toolchain.contains("msvc")) { + var tc = product.qbs.toolchain; + if (tc.contains("msvc")) { cxxFlags.push("/wd4100", "/wd4800", "/wd4127", "/wd4244", "/wd4250", "/wd4267", "/wd4334", "/wd4702", "/wd4996", "/D_ENABLE_EXTENDED_ALIGNED_STORAGE"); } @@ -55,10 +56,11 @@ Product { } if (product.qbs.targetOS.contains("unix")) cxxFlags.push("-fPIC"); + if (product.qbs.buildVariant === "release") + cxxFlags.push(tc.contains("msvc") ? "/O2" : "-O3"); if (cxxFlags.length > 0) args.push("--cxxflags=" + cxxFlags.join(" ")); var ccOption = "--cc="; - var tc = product.qbs.toolchain; if (tc.contains("msvc")) ccOption += "msvc"; else if (tc.contains("clang")) From 0ebe8402c7f2ae68845c2812fbd6af4d091ec229 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 25 Sep 2018 19:21:36 +0200 Subject: [PATCH 13/16] Debugger: Fix breakpoint disabling using context menu Change-Id: I3fa5ef2dc123f5f7f8292147626453284c1afd76 Reviewed-by: Alexandru Croitor --- src/plugins/debugger/breakhandler.cpp | 24 ++++++++++++++++-------- src/plugins/debugger/breakhandler.h | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index 916c35c77d6..4a43a7935aa 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -1557,8 +1557,11 @@ bool BreakHandler::setData(const QModelIndex &idx, const QVariant &value, int ro const bool isEnabled = (bps.isEmpty() && sbps.isEmpty()) || (!bps.isEmpty() && bps.at(0)->isEnabled()) || (!sbps.isEmpty() && sbps.at(0)->params.enabled); - for (Breakpoint bp : bps) + for (Breakpoint bp : bps) { requestBreakpointEnabling(bp, !isEnabled); + if (GlobalBreakpoint gbp = bp->globalBreakpoint()) + gbp->setEnabled(!isEnabled, false); + } for (SubBreakpoint sbp : sbps) requestSubBreakpointEnabling(sbp, !isEnabled); return true; @@ -1642,8 +1645,11 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev) : breakpointsEnabled ? tr("Disable Breakpoint") : tr("Enable Breakpoint"), !selectedBreakpoints.isEmpty(), [this, selectedBreakpoints, breakpointsEnabled] { - for (Breakpoint bp : selectedBreakpoints) + for (Breakpoint bp : selectedBreakpoints) { requestBreakpointEnabling(bp, !breakpointsEnabled); + if (GlobalBreakpoint gbp = bp->globalBreakpoint()) + gbp->setEnabled(!breakpointsEnabled, false); + } } ); @@ -2311,18 +2317,20 @@ void GlobalBreakpointItem::updateMarker() m_marker->setToolTip(toolTip()); } -void GlobalBreakpointItem::setEnabled(bool enabled) +void GlobalBreakpointItem::setEnabled(bool enabled, bool descend) { QTC_CHECK(m_params.enabled != enabled); m_params.enabled = enabled; updateMarkerIcon(); update(); - for (QPointer engine : EngineManager::engines()) { - BreakHandler *handler = engine->breakHandler(); - for (Breakpoint bp : handler->breakpoints()) { - if (bp->globalBreakpoint() == this) - handler->requestBreakpointEnabling(bp, enabled); + if (descend) { + for (QPointer engine : EngineManager::engines()) { + BreakHandler *handler = engine->breakHandler(); + for (Breakpoint bp : handler->breakpoints()) { + if (bp->globalBreakpoint() == this) + handler->requestBreakpointEnabling(bp, enabled); + } } } } diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 048e2f996ad..6df2080429c 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -85,7 +85,7 @@ public: int modelId() const; bool isEnabled() const { return m_params.enabled; } - void setEnabled(bool enabled); + void setEnabled(bool enabled, bool descend = true); const BreakpointParameters &requestedParameters() const { return m_params; } From c37bedfb0297b631e033c92ccf02e29a58b5914e Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 18 Sep 2018 10:43:17 +0200 Subject: [PATCH 14/16] LSP: split out settings specific for std io clients Change-Id: I25eebfc15a9d0d5665e57137f016e54a069ca849 Reviewed-by: Christian Stenger --- src/plugins/languageclient/baseclient.cpp | 15 +- src/plugins/languageclient/baseclient.h | 7 +- .../languageclient/languageclientmanager.cpp | 1 + .../languageclient/languageclientsettings.cpp | 169 +++++++++++------- .../languageclient/languageclientsettings.h | 58 ++++-- 5 files changed, 165 insertions(+), 85 deletions(-) diff --git a/src/plugins/languageclient/baseclient.cpp b/src/plugins/languageclient/baseclient.cpp index e885454a4b1..260275e2369 100644 --- a/src/plugins/languageclient/baseclient.cpp +++ b/src/plugins/languageclient/baseclient.cpp @@ -499,6 +499,11 @@ bool BaseClient::isSupportedMimeType(const QString &mimeType) const return m_supportedMimeTypes.isEmpty() || m_supportedMimeTypes.contains(mimeType); } +bool BaseClient::needsRestart(const BaseSettings *) const +{ + return false; +} + bool BaseClient::reset() { if (!m_restartsLeft) @@ -756,6 +761,11 @@ StdIOClient::~StdIOClient() Utils::SynchronousProcess::stopProcess(m_process); } +bool StdIOClient::needsRestart(const StdIOSettings *settings) +{ + return m_executable != settings->m_executable || m_arguments != settings->m_arguments; +} + bool StdIOClient::start() { m_process.start(); @@ -771,11 +781,6 @@ void StdIOClient::setWorkingDirectory(const QString &workingDirectory) m_process.setWorkingDirectory(workingDirectory); } -bool StdIOClient::matches(const BaseSettings *setting) -{ - return setting->m_executable == m_executable && setting->m_arguments == m_arguments; -} - void StdIOClient::sendData(const QByteArray &data) { if (m_process.state() != QProcess::Running) { diff --git a/src/plugins/languageclient/baseclient.h b/src/plugins/languageclient/baseclient.h index 08077f37ab9..3ecefcd584a 100644 --- a/src/plugins/languageclient/baseclient.h +++ b/src/plugins/languageclient/baseclient.h @@ -112,8 +112,9 @@ public: Core::Id id() const { return m_id; } + bool needsRestart(const BaseSettings *) const; + virtual bool start() { return true; } - virtual bool matches(const BaseSettings * /*setting*/) { return false; } virtual bool reset(); void log(const QString &message, @@ -175,12 +176,12 @@ public: StdIOClient &operator=(const StdIOClient &) = delete; StdIOClient &operator=(StdIOClient &&) = delete; + bool needsRestart(const StdIOSettings *settings); + bool start() override; void setWorkingDirectory(const QString &workingDirectory); - bool matches(const BaseSettings *setting) override; - protected: void sendData(const QByteArray &data) final; QProcess m_process; diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index 325f6e62241..d609596c367 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -167,6 +167,7 @@ void LanguageClientManager::removeMarks(const Core::Id &id) void LanguageClientManager::startClient(BaseClient *client) { + QTC_ASSERT(client, return); if (managerInstance->m_shuttingDown) { managerInstance->clientFinished(client); return; diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index b2c6adc8ca0..f139456aef1 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -23,8 +23,10 @@ ** ****************************************************************************/ -#include "languageclientmanager.h" #include "languageclientsettings.h" + +#include "baseclient.h" +#include "languageclientmanager.h" #include "languageclient_global.h" #include @@ -71,8 +73,9 @@ public: bool setData(const QModelIndex &index, const QVariant &value, int role) override; Qt::ItemFlags flags(const QModelIndex &index) const override; - void reset(const QList &settings); - QList settings() const { return m_settings; } + void reset(const QList &settings); + QList settings() const { return m_settings; } + QList removed() const { return m_removed; } enum Columns { DisplayNameColumn = 0, @@ -84,7 +87,8 @@ public: }; private: - QList m_settings; // owned + QList m_settings; // owned + QList m_removed; }; class LanguageClientSettingsPageWidget : public QWidget @@ -115,7 +119,7 @@ public: private: LanguageClientSettingsModel m_model; - QList m_settings; // owned + QList m_settings; // owned QPointer m_widget; }; @@ -229,43 +233,33 @@ QWidget *LanguageClientSettingsPage::widget() void LanguageClientSettingsPage::apply() { qDeleteAll(m_settings); - m_settings = Utils::transform(m_model.settings(), [](const BaseSettings *other){ - return new BaseSettings(*other); + m_settings = Utils::transform(m_model.settings(), [](const StdIOSettings *other){ + return dynamic_cast(other->copy()); }); LanguageClientSettings::toSettings(Core::ICore::settings(), m_settings); - const QVector interfaces(LanguageClientManager::clients()); - QVector toShutdown; - QList toStart = m_settings; - // check currently registered interfaces - for (auto interface : interfaces) { - auto setting = Utils::findOr(m_settings, nullptr, - [interface](const BaseSettings *setting){ - return interface->matches(setting); - }); - if (setting && setting->isValid() && setting->m_enabled) { - toStart.removeAll(setting); - if (!interface->isSupportedMimeType(setting->m_mimeType)) - interface->setSupportedMimeType({setting->m_mimeType}); - } else { - toShutdown << interface; + QList restarts = Utils::filtered(m_settings, &StdIOSettings::needsRestart); + for (auto setting : restarts + m_model.removed()) { + if (auto client = setting->m_client) { + if (client->reachable()) + client->shutdown(); + else + LanguageClientManager::deleteClient(client); } } - for (auto interface : toShutdown) { - if (interface->reachable()) - interface->shutdown(); - else - LanguageClientManager::deleteClient(interface); - } - for (auto setting : toStart) { - if (setting && setting->isValid() && setting->m_enabled) - LanguageClientManager::startClient(setting->createClient()); + for (StdIOSettings *setting : restarts) { + if (setting && setting->isValid() && setting->m_enabled) { + if (auto client = setting->createClient()) { + setting->m_client = client; + LanguageClientManager::startClient(client); + } + } } + m_model.reset(m_settings); } void LanguageClientSettingsPage::finish() { - m_model.reset(m_settings); } LanguageClientSettingsModel::~LanguageClientSettingsModel() @@ -277,7 +271,7 @@ QVariant LanguageClientSettingsModel::data(const QModelIndex &index, int role) c { if (!index.isValid()) return QVariant(); - BaseSettings *setting = m_settings[index.row()]; + StdIOSettings *setting = m_settings[index.row()]; QTC_ASSERT(setting, return false); if (role == Qt::DisplayRole || role == Qt::EditRole) { switch (index.column()) { @@ -314,7 +308,7 @@ bool LanguageClientSettingsModel::removeRows(int row, int count, const QModelInd const int end = qMin(row + count - 1, int(m_settings.size()) - 1); beginRemoveRows(parent, row, end); for (auto i = end; i >= row; --i) - delete m_settings.takeAt(i); + m_removed << m_settings.takeAt(i); endRemoveRows(); return true; } @@ -325,7 +319,7 @@ bool LanguageClientSettingsModel::insertRows(int row, int count, const QModelInd return false; beginInsertRows(parent, row, row + count - 1); for (int i = 0; i < count; ++i) - m_settings.insert(row + i, new BaseSettings()); + m_settings.insert(row + i, new StdIOSettings()); endInsertRows(); return true; } @@ -334,23 +328,31 @@ bool LanguageClientSettingsModel::setData(const QModelIndex &index, const QVaria { if (!index.isValid()) return false; - BaseSettings *setting = m_settings[index.row()]; + StdIOSettings *setting = m_settings[index.row()]; QTC_ASSERT(setting, return false); if (role == Qt::DisplayRole || role == Qt::EditRole) { + const QString strVal(value.toString()); + QString *settingsValue = nullptr; switch (index.column()) { - case DisplayNameColumn: setting->m_name = value.toString(); break; - case MimeTypeColumn: setting->m_mimeType = value.toString(); break; - case ExecutableColumn: setting->m_executable = value.toString(); break; - case ArgumentsColumn: setting->m_arguments = value.toString(); break; - default: - return false; + case DisplayNameColumn: settingsValue = &setting->m_name; break; + case MimeTypeColumn: settingsValue = &setting->m_mimeType; break; + case ExecutableColumn: settingsValue = &setting->m_executable; break; + case ArgumentsColumn: settingsValue = &setting->m_arguments; break; + } + if (settingsValue) { + if (strVal != *settingsValue) { + *settingsValue = value.toString(); + emit dataChanged(index, index, { Qt::EditRole, Qt::DisplayRole }); + } + return true; } - emit dataChanged(index, index, { Qt::EditRole, Qt::DisplayRole }); - return true; } + if (role == Qt::CheckStateRole && index.column() == EnabledColumn) { - setting->m_enabled = value.toBool(); - emit dataChanged(index, index, { Qt::CheckStateRole }); + if (setting->m_enabled != value.toBool()) { + setting->m_enabled = !setting->m_enabled; + emit dataChanged(index, index, { Qt::CheckStateRole }); + } return true; } return false; @@ -364,28 +366,31 @@ Qt::ItemFlags LanguageClientSettingsModel::flags(const QModelIndex &index) const return defaultFlags; } -void LanguageClientSettingsModel::reset(const QList &settings) +void LanguageClientSettingsModel::reset(const QList &settings) { beginResetModel(); qDeleteAll(m_settings); - m_settings = Utils::transform(settings, [](const BaseSettings *setting){ - return new BaseSettings(*setting); + qDeleteAll(m_removed); + m_removed.clear(); + m_settings = Utils::transform(settings, [](const StdIOSettings *other){ + return dynamic_cast(other->copy()); }); endResetModel(); } -bool BaseSettings::isValid() +bool BaseSettings::needsRestart() const { - return !m_name.isEmpty() && !m_executable.isEmpty() && QFile::exists(m_executable); + return m_client ? !m_enabled || m_client->needsRestart(this) : m_enabled; } -BaseClient *BaseSettings::createClient() +bool BaseSettings::isValid() const { - auto client = new StdIOClient(m_executable, m_arguments); - client->setName(m_name); - if (m_mimeType != noLanguageFilter) - client->setSupportedMimeType({m_mimeType}); - return client; + return !m_name.isEmpty(); +} + +BaseClient *BaseSettings::createClient() const +{ + return nullptr; } QVariantMap BaseSettings::toMap() const @@ -394,8 +399,6 @@ QVariantMap BaseSettings::toMap() const map.insert(nameKey, m_name); map.insert(enabledKey, m_enabled); map.insert(mimeTypeKey, m_mimeType); - map.insert(executableKey, m_executable); - map.insert(argumentsKey, m_arguments); return map; } @@ -404,8 +407,6 @@ void BaseSettings::fromMap(const QVariantMap &map) m_name = map[nameKey].toString(); m_enabled = map[enabledKey].toBool(); m_mimeType = map[mimeTypeKey].toString(); - m_executable = map[executableKey].toString(); - m_arguments = map[argumentsKey].toString(); } void LanguageClientSettings::init() @@ -414,12 +415,12 @@ void LanguageClientSettings::init() settingsPage.init(); } -QList LanguageClientSettings::fromSettings(QSettings *settingsIn) +QList LanguageClientSettings::fromSettings(QSettings *settingsIn) { settingsIn->beginGroup(settingsGroupKey); auto variants = settingsIn->value(clientsKey).toList(); auto settings = Utils::transform(variants, [](const QVariant& var){ - auto settings = new BaseSettings(); + auto settings = new StdIOSettings(); settings->fromMap(var.toMap()); return settings; }); @@ -427,14 +428,52 @@ QList LanguageClientSettings::fromSettings(QSettings *settingsIn return settings; } -void LanguageClientSettings::toSettings(QSettings *settings, const QList &languageClientSettings) +void LanguageClientSettings::toSettings(QSettings *settings, const QList &languageClientSettings) { settings->beginGroup(settingsGroupKey); settings->setValue(clientsKey, Utils::transform(languageClientSettings, - [](const BaseSettings *setting){ + [](const StdIOSettings *setting){ return QVariant(setting->toMap()); })); settings->endGroup(); } +bool StdIOSettings::needsRestart() const +{ + if (BaseSettings::needsRestart()) + return true; + if (auto stdIOClient = qobject_cast(m_client)) + return stdIOClient->needsRestart(this); + return false; +} + +bool StdIOSettings::isValid() const +{ + return BaseSettings::isValid() && !m_executable.isEmpty(); +} + +BaseClient *StdIOSettings::createClient() const +{ + auto client = new StdIOClient(m_executable, m_arguments); + client->setName(m_name); + if (m_mimeType != noLanguageFilter) + client->setSupportedMimeType({m_mimeType}); + return client; +} + +QVariantMap StdIOSettings::toMap() const +{ + QVariantMap map = BaseSettings::toMap(); + map.insert(executableKey, m_executable); + map.insert(argumentsKey, m_arguments); + return map; +} + +void StdIOSettings::fromMap(const QVariantMap &map) +{ + BaseSettings::fromMap(map); + m_executable = map[executableKey].toString(); + m_arguments = map[argumentsKey].toString(); +} + } // namespace LanguageClient diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h index 00cc3d68f0c..9f03d7d6ab8 100644 --- a/src/plugins/languageclient/languageclientsettings.h +++ b/src/plugins/languageclient/languageclientsettings.h @@ -41,35 +41,69 @@ class BaseSettings { public: BaseSettings() = default; - BaseSettings(const QString &name, bool enabled, const QString &mimeTypeName, - const QString &executable, const QString &arguments) + BaseSettings(const QString &name, bool enabled, const QString &mimeTypeName) : m_name(name) , m_enabled(enabled) , m_mimeType(mimeTypeName) - , m_executable(executable) - , m_arguments(arguments) {} + + virtual ~BaseSettings() = default; + QString m_name = QString("New Language Server"); bool m_enabled = true; QString m_mimeType = QLatin1String(noLanguageFilter); + QPointer m_client; // not owned + + virtual BaseSettings *copy() const { return new BaseSettings(*this); } + virtual bool needsRestart() const; + virtual bool isValid() const ; + virtual BaseClient *createClient() const; + virtual QVariantMap toMap() const; + virtual void fromMap(const QVariantMap &map); + +protected: + BaseSettings(const BaseSettings &other) = default; + BaseSettings(BaseSettings &&other) = default; + BaseSettings &operator=(const BaseSettings &other) = default; + BaseSettings &operator=(BaseSettings &&other) = default; +}; + +class StdIOSettings : public BaseSettings +{ +public: + StdIOSettings() = default; + StdIOSettings(const QString &name, bool enabled, const QString &mimeTypeName, + const QString &executable, const QString &arguments) + : BaseSettings(name, enabled, mimeTypeName) + , m_executable(executable) + , m_arguments(arguments) + {} + + ~StdIOSettings() override = default; + QString m_executable; QString m_arguments; - bool isValid(); + BaseSettings *copy() const override { return new StdIOSettings(*this); } + bool needsRestart() const override; + bool isValid() const override; + BaseClient *createClient() const override; + QVariantMap toMap() const override; + void fromMap(const QVariantMap &map) override; - BaseClient *createClient(); - - QVariantMap toMap() const; - void fromMap(const QVariantMap &map); +protected: + StdIOSettings(const StdIOSettings &other) = default; + StdIOSettings(StdIOSettings &&other) = default; + StdIOSettings &operator=(const StdIOSettings &other) = default; + StdIOSettings &operator=(StdIOSettings &&other) = default; }; class LanguageClientSettings { public: static void init(); - static QList fromSettings(QSettings *settings); - static void toSettings(QSettings *settings, const QList &languageClientSettings); - + static QList fromSettings(QSettings *settings); + static void toSettings(QSettings *settings, const QList &languageClientSettings); }; } // namespace LanguageClient From c920c8aafa7b27bb7f8fbc01c2658777c23ed889 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 15 Oct 2018 14:23:46 +0200 Subject: [PATCH 15/16] Botan: Fix MSVC build Was broken by a patch rebase. Change-Id: Ifce3a4c799895bac30b5b3e07a18e3fe6a1da070 Reviewed-by: Christian Stenger Reviewed-by: Ivan Donchevskii --- src/libs/botan/botan.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/botan/botan.pro b/src/libs/botan/botan.pro index 0f2f18b1812..89d7353aa64 100644 --- a/src/libs/botan/botan.pro +++ b/src/libs/botan/botan.pro @@ -35,7 +35,7 @@ macos: BOTAN_CXX_FLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET unix: BOTAN_CXX_FLAGS += -fPIC win32: OTHER_FLAGS += --link-method=hardlink CONFIG(debug, debug|release) { - OTHER_FLAGS += --with-debug-info + OTHER_FLAGS += --debug-mode } else { msvc: BOTAN_CXX_FLAGS += /O2 else: BOTAN_CXX_FLAGS += -O3 From f612833d83f527cc3bcb394d689e93ab51c88e71 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 15 Oct 2018 17:26:56 +0200 Subject: [PATCH 16/16] Debugger: Pretty print the name of a function when using lldb This is achieved by calling "po" on an address value casted to a simple function pointer type, regardless of the actual type of the function pointer. lldb does not complain, and reports the library where the function is defined, its name, and location in the source code if available. Change-Id: I23ccce62e33bcf213ccdcb55c9836d54333f3c86 Reviewed-by: hjk --- share/qtcreator/debugger/lldbbridge.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 6f8871f9777..8a6b86f1cdb 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -457,7 +457,7 @@ class Dumper(DumperBase): self.listMembers(value, nativeType) tdata.templateArguments = self.listTemplateParametersHelper(nativeType) elif code == lldb.eTypeClassFunction: - tdata.code = TypeCodeFunction, + tdata.code = TypeCodeFunction elif code == lldb.eTypeClassMemberPointer: tdata.code = TypeCodeMemberPointer @@ -649,6 +649,21 @@ class Dumper(DumperBase): def isMsvcTarget(self): return False + def prettySymbolByAddress(self, address): + try: + result = lldb.SBCommandReturnObject() + # Cast the address to a function pointer to get the name and location of the function. + expression = 'po (void (*)()){}' + self.debugger.GetCommandInterpreter().HandleCommand(expression.format(address), result) + output = '' + if result.Succeeded(): + output = result.GetOutput().strip() + if output: + return output + except: + pass + return '0x%x' % address + def qtVersionAndNamespace(self): for func in self.target.FindFunctions('qVersion'): name = func.GetSymbol().GetName()