<table><tr><td style="">apol updated this revision to Diff 10265.<br />apol added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D4095" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>Rebase</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R32 KDevelop</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D4095?vs=10264&id=10265" rel="noreferrer">https://phabricator.kde.org/D4095?vs=10264&id=10265</a></div></div><br /><div><strong>BRANCH</strong><div><div>apol/cmakeserver</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D4095" rel="noreferrer">https://phabricator.kde.org/D4095</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>.gitignore<br />
CMakeLists.txt<br />
analyzers/cppcheck/job.h<br />
analyzers/cppcheck/parameters.cpp<br />
analyzers/cppcheck/parser.cpp<br />
analyzers/cppcheck/plugin.cpp<br />
analyzers/cppcheck/plugin.h<br />
app/main.cpp<br />
app/urlinfo.h<br />
debuggers/common/dialogs/processselection.h<br />
debuggers/common/dialogs/selectcoredialog.h<br />
debuggers/common/mi/mi.h<br />
debuggers/common/mi/micommand.h<br />
debuggers/common/mibreakpointcontroller.cpp<br />
debuggers/common/mibreakpointcontroller.h<br />
debuggers/common/midebugjobs.h<br />
debuggers/common/midebugsession.cpp<br />
debuggers/common/miframestackmodel.h<br />
debuggers/common/mivariable.cpp<br />
debuggers/common/mivariable.h<br />
debuggers/common/mivariablecontroller.cpp<br />
debuggers/common/mivariablecontroller.h<br />
debuggers/common/registers/registercontroller.h<br />
debuggers/common/registers/registercontroller_arm.h<br />
debuggers/common/registers/registercontroller_x86.h<br />
debuggers/common/registers/registersmanager.h<br />
debuggers/common/registers/registersview.h<br />
debuggers/common/stty.h<br />
debuggers/common/widgets/debuggerconsoleview.h<br />
debuggers/common/widgets/disassemblewidget.h<br />
debuggers/gdb/TODO.txt<br />
debuggers/gdb/debuggerplugin.h<br />
debuggers/gdb/gdbbreakpointcontroller.h<br />
debuggers/gdb/gdbconfigpage.h<br />
debuggers/gdb/gdbframestackmodel.h<br />
debuggers/gdb/gdboutputwidget.h<br />
debuggers/gdb/memviewdlg.h<br />
debuggers/gdb/printers/tests/qlistcontainer.cpp<br />
debuggers/gdb/printers/tests/qtprinters.cpp<br />
debuggers/gdb/unittests/test_gdb.cpp<br />
debuggers/gdb/variablecontroller.h<br />
debuggers/lldb/TODO.txt<br />
debuggers/lldb/controllers/breakpointcontroller.h<br />
debuggers/lldb/controllers/framestackmodel.cpp<br />
debuggers/lldb/controllers/framestackmodel.h<br />
debuggers/lldb/controllers/variable.cpp<br />
debuggers/lldb/controllers/variablecontroller.cpp<br />
debuggers/lldb/controllers/variablecontroller.h<br />
debuggers/lldb/debuggerplugin.h<br />
debuggers/lldb/debugsession.cpp<br />
debuggers/lldb/formatters/helpers.py<br />
debuggers/lldb/formatters/kde.py<br />
debuggers/lldb/formatters/qt.py<br />
debuggers/lldb/lldbcommand.cpp<br />
debuggers/lldb/lldbcommand.h<br />
debuggers/lldb/unittests/debugees/debugeeqt.cpp<br />
debuggers/lldb/unittests/debugees/qbytearray.cpp<br />
debuggers/lldb/unittests/debugees/qlistcontainer.cpp<br />
debuggers/lldb/unittests/debugees/qstring.cpp<br />
debuggers/lldb/unittests/test_lldb.cpp<br />
debuggers/lldb/unittests/test_lldb.h<br />
debuggers/lldb/unittests/test_lldbformatters.cpp<br />
debuggers/lldb/unittests/test_lldbformatters.h<br />
debuggers/lldb/unittests/testhelper.cpp<br />
debuggers/lldb/unittests/testhelper.h<br />
debuggers/lldb/widgets/lldbconfigpage.h<br />
doc/kdevelop/index.docbook<br />
documentation/manpage/manpagemodel.h<br />
documentation/manpage/manpageplugin.h<br />
documentation/qthelp/qthelpnetwork.h<br />
documentation/qthelp/tests/test_qthelpplugin.cpp<br />
file_templates/testing/python_pyunit/class.py<br />
format.config.uncrustify.4_spaces<br />
formatters/astyle/astyle_preferences.h<br />
formatters/astyle/astyle_stringiterator.h<br />
formatters/astyle/lib/ASBeautifier.cpp<br />
formatters/astyle/lib/ASFormatter.cpp<br />
formatters/astyle/lib/ASLocalizer.cpp<br />
formatters/astyle/tests/test_astyle.cpp<br />
formatters/customscript/customscript_plugin.cpp<br />
formatters/customscript/customscript_plugin.h<br />
kdeintegration/executeplasmoid/executeplasmoidplugin.h<br />
kdeintegration/executeplasmoid/plasmoidexecutionconfig.h<br />
languages/clang/clanghighlighting.cpp<br />
languages/clang/clangsettings/sessionsettings/sessionconfigskeleton.h<br />
languages/clang/codecompletion/context.cpp<br />
languages/clang/codecompletion/includepathcompletioncontext.cpp<br />
languages/clang/codecompletion/model.h<br />
languages/clang/codegen/adaptsignatureassistant.h<br />
languages/clang/codegen/clangrefactoring.cpp<br />
languages/clang/codegen/clangrefactoring.h<br />
languages/clang/codegen/codegenhelper.cpp<br />
languages/clang/duchain/clangducontext.h<br />
languages/clang/duchain/clangindex.h<br />
languages/clang/duchain/clangparsingenvironmentfile.h<br />
languages/clang/duchain/clangproblem.h<br />
languages/clang/duchain/debugvisitor.h<br />
languages/clang/duchain/macrodefinition.h<br />
languages/clang/duchain/macronavigationcontext.h<br />
languages/clang/duchain/missingincludepathproblem.cpp<br />
languages/clang/duchain/navigationwidget.cpp<br />
languages/clang/duchain/navigationwidget.h<br />
languages/clang/duchain/parsesession.h<br />
languages/clang/duchain/types/classspecializationtype.h<br />
languages/clang/duchain/unsavedfile.h<br />
languages/clang/tests/CMakeLists.txt<br />
languages/clang/tests/codecompletiontestbase.cpp<br />
languages/clang/tests/test_buddies.cpp<br />
languages/clang/tests/test_clangutils.cpp<br />
languages/clang/tests/test_duchain.cpp<br />
languages/clang/tests/test_duchainutils.cpp<br />
languages/clang/tests/test_problems.cpp<br />
languages/clang/tests/test_refactoring.cpp<br />
languages/clang/tests/test_refactoring.h<br />
languages/clang/util/clangtypes.cpp<br />
languages/clang/util/clangtypes.h<br />
languages/clang/util/clangutils.h<br />
languages/plugins/custom-definesandincludes/compilerprovider/compilerprovider.cpp<br />
languages/plugins/custom-definesandincludes/compilerprovider/settingsmanager.h<br />
languages/plugins/custom-definesandincludes/compilerprovider/widget/compilersmodel.cpp<br />
languages/plugins/custom-definesandincludes/compilerprovider/widget/compilersmodel.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/defineswidget.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/includesmodel.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.cpp<br />
languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h<br />
languages/plugins/custom-definesandincludes/kcm_widget/projectpathswidget.h<br />
languages/plugins/custom-definesandincludes/noprojectincludesanddefines/noprojectcustomincludepaths.h<br />
languages/qmljs/codecompletion/model.h<br />
languages/qmljs/codecompletion/worker.h<br />
languages/qmljs/duchain/contextbuilder.h<br />
languages/qmljs/duchain/debugvisitor.h<br />
languages/qmljs/duchain/declarationbuilder.cpp<br />
languages/qmljs/duchain/declarationbuilder.h<br />
languages/qmljs/duchain/functiondeclaration.h<br />
languages/qmljs/duchain/functiontype.h<br />
languages/qmljs/duchain/qmljsducontext.h<br />
languages/qmljs/duchain/usebuilder.h<br />
languages/qmljs/libs/CMakeLists.txt<br />
languages/qmljs/libs/qmljs/qmljsimportdependencies.h<br />
languages/qmljs/libs/qmljs/qmljstypedescriptionreader.cpp<br />
languages/qmljs/libs/utils/fileutils.cpp<br />
languages/qmljs/navigation/propertypreviewwidget.h<br />
languages/qmljs/qmljshighlighting.cpp<br />
languages/qmljs/qmljshighlighting.h<br />
projectbuilders/cmakebuilder/cmakebuilder.cpp<br />
projectbuilders/cmakebuilder/cmakejob.h<br />
projectbuilders/cmakebuilder/prunejob.h<br />
projectbuilders/ninjabuilder/kdevninjabuilderplugin.h<br />
projectbuilders/qmakebuilder/qmakebuilderpreferences.cpp<br />
projectbuilders/qmakebuilder/qmakejob.cpp<br />
projectbuilders/qmakebuilder/qmakejob.h<br />
projectmanagers/cmake/CMakeLists.txt<br />
projectmanagers/cmake/cmakecodecompletionmodel.h<br />
projectmanagers/cmake/cmakeextraargumentshistory.h<br />
projectmanagers/cmake/cmakehelpdocumentation.h<br />
projectmanagers/cmake/cmakeimportjob.cpp<br />
projectmanagers/cmake/cmakeimportjob.h<br />
projectmanagers/cmake/cmakeimportjsonjob.cpp<br />
projectmanagers/cmake/cmakeimportjsonjob.h<br />
projectmanagers/cmake/cmakemanager.cpp<br />
projectmanagers/cmake/cmakemanager.h<br />
projectmanagers/cmake/cmakeprojectdata.cpp<br />
projectmanagers/cmake/cmakeprojectdata.h<br />
projectmanagers/cmake/cmakeserver.cpp<br />
projectmanagers/cmake/cmakeserver.h<br />
projectmanagers/cmake/cmakeserverimportjob.cpp<br />
projectmanagers/cmake/cmakeserverimportjob.h<br />
projectmanagers/cmake/cmakeutils.cpp<br />
projectmanagers/cmake/cmakeutils.h<br />
projectmanagers/cmake/duchain/usebuilder.h<br />
projectmanagers/cmake/parser/cmakeduchaintypes.h<br />
projectmanagers/cmake/parser/cmakelistsparser.h<br />
projectmanagers/cmake/parser/cmaketypes.h<br />
projectmanagers/cmake/settings/cmakecachedelegate.h<br />
projectmanagers/cmake/settings/cmakepreferences.cpp<br />
projectmanagers/cmake/tests/CMakeLists.txt<br />
projectmanagers/cmake/tests/cmakeprojectvisitortest.cpp<br />
projectmanagers/cmake/tests/manual/kf5_app/CMakeLists.txt<br />
projectmanagers/cmake/tests/manual/target_includes/CMakeLists.txt<br />
projectmanagers/cmake/tests/paths.h.cmake<br />
projectmanagers/cmake/tests/test_cmakemanager.cpp<br />
projectmanagers/cmake/tests/test_cmakeserver.cpp<br />
projectmanagers/cmake/tests/testhelpers.h<br />
projectmanagers/custom-buildsystem/CMakeLists.txt<br />
projectmanagers/custom-buildsystem/configconstants.cpp<br />
projectmanagers/custom-buildsystem/configconstants.h<br />
projectmanagers/custom-buildsystem/configwidget.h<br />
projectmanagers/custom-buildsystem/custombuildjob.cpp<br />
projectmanagers/custom-buildsystem/custombuildsystemconfigwidget.cpp<br />
projectmanagers/custom-buildsystem/custombuildsystemconfigwidget.h<br />
projectmanagers/custom-buildsystem/custombuildsystemplugin.cpp<br />
projectmanagers/custom-buildsystem/tests/CMakeLists.txt<br />
projectmanagers/custom-buildsystem/tests/projects/builddirproject/.kdev4/builddirproject.kdev4<br />
projectmanagers/custom-buildsystem/tests/projects/multipathproject/.kdev4/multipathproject.kdev4<br />
projectmanagers/custom-buildsystem/tests/projects/simpleproject/.kdev4/simpleproject.kdev4<br />
projectmanagers/custommake/custommakemanager.cpp<br />
projectmanagers/custommake/makefileresolver/makefileresolver.cpp<br />
projectmanagers/custommake/makefileresolver/makefileresolver.h<br />
projectmanagers/qmake/parser/ast.h<br />
projectmanagers/qmake/parser/qmakedebugvisitor.h<br />
projectmanagers/qmake/parser/tests/assignmenttest.h<br />
projectmanagers/qmake/parser/tests/functionscopetest.h<br />
projectmanagers/qmake/parser/tests/lexertest.h<br />
projectmanagers/qmake/parser/tests/parsetest.h<br />
projectmanagers/qmake/parser/tests/scopetest.h<br />
projectmanagers/qmake/qmakecache.h<br />
projectmanagers/qmake/qmakefile.h<br />
projectmanagers/qmake/qmakeprojectfile.h<br />
projectmanagers/qmake/tests/test_qmakeproject.h<br />
providers/ghprovider/ghlineedit.h<br />
providers/kdeprovider/kdeprojectsmodel.h<br />
providers/kdeprovider/kdeproviderwidget.cpp<br />
providers/kdeprovider/kdeproviderwidget.h<br />
release-scripts/update-versions.sh<br />
utils/okteta/oktetadocument.cpp</div></div></div><br /><div><strong>EMAIL PREFERENCES</strong><div><a href="https://phabricator.kde.org/settings/panel/emailpreferences/" rel="noreferrer">https://phabricator.kde.org/settings/panel/emailpreferences/</a></div></div><br /><div><strong>To: </strong>apol, KDevelop, kfunk<br /><strong>Cc: </strong>antonanikin, arrowdodger, kfunk, kdevelop-devel<br /></div>