[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kwrite-devel
Subject:    [kate] /: Merge branch 'frameworks'
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2014-07-24 17:44:36
Message-ID: E1XAN4G-0001hv-CD () scm ! kde ! org
[Download RAW message or body]

Git commit 94e8e951ad5d09d84d4dabc1ede05b19e51416b6 by Christoph Cullmann.
Committed on 24/07/2014 at 17:43.
Pushed by cullmann into branch 'master'.

Merge branch 'frameworks'

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

M  +0    -0    addons/close-except-like/.kateconfig
M  +0    -0    addons/filetemplates/plugin/katefiletemplates.desktop
M  +0    -0    addons/filetemplates/templates/FindXXX.cmake.katetemplate
M  +0    -0    addons/kttsd/kate_kttsd.desktop
M  +0    -0    addons/mailfiles/katemailfilesplugin.desktop
M  +0    -0    addons/pate/sip/kate/mainwindow.sip
M  +0    -0    addons/pate/src/katepythonplugin.desktop
M  +0    -0    addons/pate/src/pate.desktop
M  +0    -0    addons/pate/src/plugins/cmake_utils/cmake_help_parser.py
M  +0    -0    addons/pate/src/plugins/cmake_utils/command_completers/cmake_policy_cc.py
M  +0    -0    addons/pate/src/plugins/cmake_utils/command_completers/cond_cc.py
M  +0    -0    addons/pate/src/plugins/cmake_utils/command_completers/syntax_cc.py
M  +0    -0    addons/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop
M  +0    -0    addons/pate/src/plugins/cmake_utils/param_types.py
M  +0    -0    addons/pate/src/plugins/expand/expands_completion_model.py
M  +0    -0    addons/pate/src/plugins/expand/katepate_expand.desktop
M  +0    -0    addons/pate/src/plugins/expand/templates/basic-entity.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/brief.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/class.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/enum.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/for.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/function.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/getter-setter.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/if-else.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/main.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/metafunction-class.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/namespace.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/struct.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/switch.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/t.cpp.tpl
M  +0    -0    addons/pate/src/plugins/expand/templates/try.cpp.tpl
M  +0    -0    addons/pate/src/plugins/gid/__init__.py
M  +0    -0    addons/pate/src/plugins/gid/idutils.py
M  +0    -0    addons/pate/src/plugins/gid/katepate_gid.desktop
M  +0    -0    addons/pate/src/plugins/js_utils/katepate_js_utils.desktop
M  +0    -0    addons/pate/src/plugins/katepate_block.desktop
M  +0    -0    addons/pate/src/plugins/katepate_commentar.desktop
M  +0    -0    addons/pate/src/plugins/katepate_format.desktop
M  +0    -0    addons/pate/src/plugins/katepate_python_autocomplete_jedi.desktop
M  +0    -0    addons/pate/src/plugins/katepate_try_open_file.desktop
M  +0    -0    addons/pate/src/plugins/katepate_xml_pretty.desktop
M  +0    -0    addons/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop
M  +0    -0    addons/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop
M  +0    -0    addons/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop
M  +0    -0    addons/pate/src/plugins/python_console_ipython/python_console_ipython.py
M  +0    -0    addons/pate/src/plugins/python_utils/katepate_python_utils.desktop
M  +0    -0    addons/sessionapplet/plasma-applet-katesession.desktop
M  +0    -0    addons/textfilter/katetextfilter.desktop
M  +0    -0    addons/xmlcheck/katexmlcheck.desktop
M  +0    -0    kate/data/org.kde.kate.desktop

http://commits.kde.org/kate/94e8e951ad5d09d84d4dabc1ede05b19e51416b6
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel
[prev in list] [next in list] [prev in thread] [next in thread]