From 7741878f3e3db0663fc01e3bcf6b2d09b2779726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 15 Jun 2020 11:08:35 +0300 Subject: [PATCH] fxes for new qt --- qad/application/edockwidget.h | 4 ++-- qad/doc/markdown.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/qad/application/edockwidget.h b/qad/application/edockwidget.h index 5692fb9..87dc2fe 100644 --- a/qad/application/edockwidget.h +++ b/qad/application/edockwidget.h @@ -34,8 +34,8 @@ class QAD_EXPORT EDockWidget: public QDockWidget { Q_OBJECT public: - explicit EDockWidget(const QString & title, QWidget * parent = 0, Qt::WindowFlags flags = 0): QDockWidget(title, parent, flags) {init();} - explicit EDockWidget(QWidget * parent = 0, Qt::WindowFlags flags = 0): QDockWidget(parent, flags) {init();} + explicit EDockWidget(const QString & title, QWidget * parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()): QDockWidget(title, parent, flags) {init();} + explicit EDockWidget(QWidget * parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()): QDockWidget(parent, flags) {init();} ~EDockWidget() {delete btn_hide; delete btn_dock; delete lbl_title; delete lbl_icon; delete header;} void setFeatures(QDockWidget::DockWidgetFeatures features); diff --git a/qad/doc/markdown.cpp b/qad/doc/markdown.cpp index 871bb68..5b50af1 100644 --- a/qad/doc/markdown.cpp +++ b/qad/doc/markdown.cpp @@ -16,6 +16,12 @@ extern "C" { # ifndef MKD_TOC # define MKD_TOC 0x00001000 # endif +# ifndef MKD_AUTOLINK +# define MKD_AUTOLINK 0x00004000 +# endif +# ifndef MKD_GITHUBTAGS +# define MKD_GITHUBTAGS 0x08000000 +# endif #endif static QString markdown_css = "table { margin: 5px; background-color: #cccccc; }" @@ -41,7 +47,7 @@ QString md2html(const QByteArray & src) { mkd_set_flag_num(flagm, MKD_DLEXTRA); mkd_set_flag_num(flagm, MKD_FENCEDCODE); #else - mkd_flag_t flagm = (MKD_DLEXTRA | MKD_FENCEDCODE); + mkd_flag_t flagm = (MKD_DLEXTRA | MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK); #endif MMIOT #endif