From a7f021a093bf7e0596e60512f2ebbeee6e8d7e61 Mon Sep 17 00:00:00 2001 From: Gres Date: Fri, 24 Apr 2015 22:35:38 +0300 Subject: [PATCH] QTC version update. --- dist/README.md | 4 +++- dist/make_dist.bat | 2 +- paths.pri | 1 + src/MarkviewEditorFactory.cpp | 1 + src/MarkviewWidget.cpp | 8 +++++++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dist/README.md b/dist/README.md index 5e3367a..3fee2ce 100644 --- a/dist/README.md +++ b/dist/README.md @@ -1,3 +1,5 @@ # Changelog +## v 3.4.0 +- QTC version update ## v 3.3.1 -Initial release +- Initial release diff --git a/dist/make_dist.bat b/dist/make_dist.bat index 90a1634..9d418e6 100644 --- a/dist/make_dist.bat +++ b/dist/make_dist.bat @@ -2,7 +2,7 @@ set /p VERSION=<..\..\qtcreator-latest\version set PLUGIN_NAME=QtcMarkview -set BUILD_DIR=..\..\qtcreator-latest\release-vc10 +set BUILD_DIR=..\..\qtcreator-latest\release-vc12 del %PLUGIN_NAME%-%VERSION%-win.zip rd /Q /S dist diff --git a/paths.pri b/paths.pri index f4c496e..add88b6 100644 --- a/paths.pri +++ b/paths.pri @@ -13,4 +13,5 @@ isEmpty(IDE_BUILD_TREE){ CONFIG(debug, debug|release):IDE_BUILD_TREE=$$PWD/../qtcreator-latest/debug-x64 contains(QMAKE_TARGET.arch, x86):IDE_BUILD_TREE=$$PWD/../qtcreator-latest/release-x86 msvc:IDE_BUILD_TREE=$$PWD/../qtcreator-latest/release-vc10 + win32-msvc2013:IDE_BUILD_TREE=$$PWD/../qtcreator-latest/release-vc12 } diff --git a/src/MarkviewEditorFactory.cpp b/src/MarkviewEditorFactory.cpp index 4b548fa..269bf52 100644 --- a/src/MarkviewEditorFactory.cpp +++ b/src/MarkviewEditorFactory.cpp @@ -6,6 +6,7 @@ #include #include +#include using namespace QtcMarkview::Internal; diff --git a/src/MarkviewWidget.cpp b/src/MarkviewWidget.cpp index e23d619..df0bb5b 100644 --- a/src/MarkviewWidget.cpp +++ b/src/MarkviewWidget.cpp @@ -10,6 +10,9 @@ #include #include +#include +#include +#include using namespace QtcMarkview::Internal; @@ -43,7 +46,10 @@ MarkviewWidget::~MarkviewWidget () { } void MarkviewWidget::finalizeInitialization () { - setupAsPlainEditor (); + textDocument()->setMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT)); + + setupGenericHighlighter (); + configureGenericHighlighter (); Q_ASSERT (textDocument ()); connect (textDocument (), &TextEditor::TextDocument::contentsChanged,