Merge pull request #3 from edbee/master

Merge latest edbee in
Mudlet · May 16, 2020 · 25a7226 · 25a7226
2 parents af9dc9f + dd3d297
commit 25a7226
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 edbee.lib:
 
+- fix #98, Missing header include in Qt 5.15rc
+- fix #94 (partial), Resource delete fix in TextDocumentscopes
+- Merged PR #86, Updated QsLog
 - fix #89, Replace qSort with std::sort
 - fix #84, Customize the autoScrollMargin
 - Moved the TextLineDataManager to the core TextDocument

diff --git a/edbee-lib/edbee/models/textdocumentscopes.cpp b/edbee-lib/edbee/models/textdocumentscopes.cpp
@@ -267,7 +267,7 @@ TextScope::TextScope()
 // Destructs the textscope
 TextScope::~TextScope()
 {
-    delete scopeAtoms_;
+    delete[] scopeAtoms_;
 }
 
 

diff --git a/edbee-lib/edbee/views/components/texteditorrenderer.cpp b/edbee-lib/edbee/views/components/texteditorrenderer.cpp
@@ -6,6 +6,7 @@
 #include "texteditorrenderer.h"
 
 #include <QPainter>
+#include <QPainterPath>
 #include <QTextLayout>
 
 #include "edbee/models/textdocument.h"

diff --git a/edbee-test/main.cpp b/edbee-test/main.cpp
@@ -42,8 +42,8 @@ int main(int argc, char* argv[])
 
     // make sure we see the QsLogging items
     QsLogging::Logger& logger = QsLogging::Logger::instance();
-    static QsLogging::DestinationPtr debugDestination( QsLogging::DestinationFactory::MakeDebugOutputDestination() );
-    logger.addDestination(debugDestination.get());
+    static QsLogging::DestinationPtrU debugDestination( QsLogging::DestinationFactory::MakeDebugOutputDestination() );
+    logger.addDestination(std::move(debugDestination));
     logger.setLoggingLevel(QsLogging::TraceLevel);