-
Christoph Cullmann authored
merge our frameworks KF5/Qt5 to master we might need to fixup pate, as this is now some old pate from frameworks and we need to port to PyQt5/... main development should now really happen on master 4.14 for last fixes and minor improvements CCMAIL: kwrite-devel@kde.org Conflicts: addons/kate/CMakeLists.txt addons/kate/backtracebrowser/katebacktracebrowserplugin.desktop addons/kate/close-except-like/close_except_plugin.cpp addons/kate/close-except-like/katecloseexceptplugin.desktop addons/kate/filebrowser/katefilebrowserplugin.desktop addons/kate/gdbplugin/configview.cpp addons/kate/gdbplugin/kategdbplugin.desktop addons/kate/helloworld/katehelloworld.desktop addons/kate/kate-ctags/katectagsplugin.desktop addons/kate/katebuild-plugin/build.ui addons/kate/katebuild-plugin/katebuildplugin.desktop addons/kate/katebuild-plugin/plugin_katebuild.cpp addons/kate/katebuild-plugin/plugin_katebuild.h addons/kate/katesql/katesql.desktop addons/kate/konsole/katekonsoleplugin.desktop addons/kate/openheader/kateopenheader.desktop addons/kate/pate/CMakeLists.txt addons/kate/pate/src/engine.cpp addons/kate/pate/src/plugins/CMakeLists.txt addons/kate/pate/src/plugins/cmake_utils/__init__.py addons/kate/pate/src/plugins/color_tools/color_tools_toolview.ui addons/kate/pate/src/plugins/color_tools/color_tools_ui.rc addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop addons/kate/pate/src/plugins/color_tools_toolview.ui addons/kate/pate/src/plugins/commentar.py addons/kate/pate/src/plugins/expand/jinja_stuff.py addons/kate/pate/src/plugins/expand/text_x-c++src.expand addons/kate/pate/src/plugins/katepate_color_tools.desktop addons/kate/pate/src/plugins/libkatepate/common.py addons/kate/project/kateproject.example addons/kate/project/kateprojectplugin.desktop addons/kate/search/katesearch.desktop addons/kate/search/plugin_search.cpp addons/kate/snippets/katesnippetsplugin.desktop addons/kate/symbolviewer/ecma_parser.cpp addons/kate/symbolviewer/katesymbolviewer.desktop addons/kate/symbolviewer/plugin_katesymbolviewer.cpp addons/kate/tabbarextension/katetabbarextension.desktop addons/kate/tabify/katetabifyplugin.desktop addons/kate/xmltools/katexmltools.desktop addons/ktexteditor/CMakeLists.txt addons/ktexteditor/autobrace/ktexteditor_autobrace.desktop addons/ktexteditor/autobrace/ktexteditor_autobrace_config.desktop addons/ktexteditor/exporter/ktexteditor_exporter.desktop addons/ktexteditor/hlselection/ktexteditor_hlselection.desktop addons/ktexteditor/insertfile/ktexteditor_insertfile.desktop addons/ktexteditor/kte_iconinserter/ktexteditor_iconinserter.desktop addons/pate/src/plugins/color_tools_toolview.ui addons/pate/src/plugins/katepate_color_tools.desktop doc/kate/highlighting.docbook examples/syntax/highlight.cc examples/syntax/highlight.pl kate/app/katemain.cpp kate/app/katemainwindow.cpp kate/app/katemainwindow.h kate/app/katequickopen.cpp kate/app/katequickopen.h kate/app/katesession.cpp kate/app/katesession.h kate/app/kateviewmanager.cpp kate/data/kateplugin.desktop kate/filetree/katefiletreemodel.cpp kate/filetree/katefiletreeplugin.cpp kate/filetree/katefiletreeplugin.desktop ktexteditor/annotationinterface.h ktexteditor/configinterface.h ktexteditor/kcm_ktexteditor.desktop ktexteditor/ktexteditor.desktop ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop ktexteditor/ktexteditorplugin.desktop ktexteditor/view.h kwrite/kwrite.desktop kwrite/kwritemain.cpp kwrite/kwritemain.h part/CMakeLists.txt part/buffer/katetextloader.h part/completion/expandingtree/expandingdelegate.cpp part/completion/katecompletionmodel.cpp part/completion/katewordcompletion.cpp part/data/katepart.desktop part/data/katepartui.rc part/dialogs/completionconfigtab.ui part/dialogs/katedialogs.cpp part/dialogs/katedialogs.h part/dialogs/textareaappearanceconfigwidget.ui part/dialogs/viinputmodeconfigwidget.ui part/document/katedocument.cpp part/document/katedocument.h part/render/katelayoutcache.cpp part/render/katerenderer.h part/schema/kateschemaconfig.cpp part/script/data/indentation/cppstyle.js part/script/data/indentation/cstyle.js part/script/data/indentation/haskell.js part/script/data/indentation/pascal.js part/script/data/indentation/xml.js part/search/katematch.h part/search/katesearchbar.cpp part/search/katesearchbar.h part/search/searchbarincremental.ui part/syntax/data/ada.xml part/syntax/data/alert.xml part/syntax/data/bash.xml part/syntax/data/c.xml part/syntax/data/ccss.xml part/syntax/data/cmake.xml part/syntax/data/coffee.xml part/syntax/data/cpp.xml part/syntax/data/css.xml part/syntax/data/debianchangelog.xml part/syntax/data/djangotemplate.xml part/syntax/data/doxygen.xml part/syntax/data/gcc.xml part/syntax/data/go.xml part/syntax/data/html.xml part/syntax/data/isocpp.xml part/syntax/data/javascript.xml part/syntax/data/json.xml part/syntax/data/language.dtd part/syntax/data/lilypond.xml part/syntax/data/makefile.xml part/syntax/data/mako.xml part/syntax/data/mediawiki.xml part/syntax/data/modelines.xml part/syntax/data/octave.xml part/syntax/data/perl.xml part/syntax/data/php.xml part/syntax/data/prolog.xml part/syntax/data/qml.xml part/syntax/data/rest.xml part/syntax/data/rhtml.xml part/syntax/data/scss.xml part/syntax/data/syntax.template part/syntax/katehighlight.cpp part/syntax/katehighlight.h part/syntax/katehighlighthelpers.cpp part/syntax/katehighlighthelpers.h part/utils/katecmds.cpp part/utils/kateconfig.cpp part/utils/kateconfig.h part/utils/kateglobal.cpp part/utils/kateglobal.h part/view/kateview.cpp part/view/kateview.h part/view/kateviewhelpers.cpp part/view/kateviewhelpers.h part/view/kateviewinternal.cpp part/view/kateviewinternal.h part/vimode/kateviinputmodemanager.cpp part/vimode/kateviinputmodemanager.h part/vimode/kateviinsertmode.cpp part/vimode/kateviinsertmode.h part/vimode/katevikeyparser.cpp part/vimode/katevikeyparser.h part/vimode/katevimodebase.cpp part/vimode/katevimodebase.h part/vimode/katevinormalmode.cpp part/vimode/katevinormalmode.h part/vimode/katevireplacemode.cpp part/vimode/katevireplacemode.h part/vimode/katevivisualmode.cpp tests/CMakeLists.txt tests/data/bug317111.txt tests/data/indent/cppstyle/.kateconfig tests/data/indent/cppstyle/colon7/expected tests/data/indent/cppstyle/colon7/input.js tests/data/indent/cppstyle/colon7/origin tests/data/indent/cppstyle/comma4/expected tests/data/indent/cppstyle/comma4/input.js tests/data/indent/cppstyle/comma4/origin tests/data/indent/cppstyle/pipe1/expected tests/data/indent/cppstyle/pipe1/input.js tests/data/indent/cppstyle/pipe1/origin tests/data/indent/cppstyle/semicolon7/input.js tests/data/indent/cppstyle/shortcut10/expected tests/data/indent/cppstyle/shortcut2/expected tests/data/indent/cppstyle/shortcut2/input.js tests/data/indent/cppstyle/shortcut2/origin tests/data/indent/cppstyle/shortcut6/expected tests/data/indent/cppstyle/shortcut6/input.js tests/data/indent/cppstyle/shortcut6/origin tests/data/indent/cppstyle/shortcut7/expected tests/data/indent/pascal/longtest1/expected tests/data/indent/pascal/longtest1/origin tests/indenttest.cpp tests/indenttest.h tests/katedocument_test.cpp tests/katedocument_test.h tests/kateview_test.cpp tests/kateview_test.h tests/script_test_base.h tests/scripting_test.cpp tests/vimode_test.cpp tests/vimode_test.h
94e8e951