Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-02 10:35:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

disabled compilation of cmark until it gets fixed

Browse Source
This commit is contained in:
csoler 2018-07-23 17:20:13 +02:00 committed by sehraf
parent e6acb52d17
commit a21c2724f5
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroshare-gui/src/retroshare-gui.pro
View File

@ -2,7 +2,7 @@
TEMPLATE = app TEMPLATE = app
QT += network xml QT += network xml
CONFIG += qt gui uic qrc resources idle cmark CONFIG += qt gui uic qrc resources idle
CONFIG += console CONFIG += console
TARGET = retroshare TARGET = retroshare
DEFINES += TARGET=\\\"$${TARGET}\\\" DEFINES += TARGET=\\\"$${TARGET}\\\"
@ -1371,6 +1371,7 @@ gxsgui {
} }
cmark { cmark {
DEFINES *= USE_CMARK
HEADERS += \ HEADERS += \
../../supportlibs/cmark/src/buffer.h \ ../../supportlibs/cmark/src/buffer.h \

7
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -38,9 +38,14 @@
#include "util/imageutil.h" #include "util/imageutil.h"
#include "util/rstime.h" #include "util/rstime.h"
// #define USE_CMARK
#ifdef USE_CMARK
//Include for CMark //Include for CMark
// This needs to be fixed: use system library if available, etc.
#include <gui/../../../supportlibs/cmark/src/cmark.h> #include <gui/../../../supportlibs/cmark/src/cmark.h>
#include <gui/../../../supportlibs/cmark/src/node.h> #include <gui/../../../supportlibs/cmark/src/node.h>
#endif
#include <iostream> #include <iostream>
@ -586,6 +591,7 @@ QString RsHtml::formatText(QTextDocument *textDocument, const QString &text, ulo
// Save Space and Tab because doc loose it. // Save Space and Tab because doc loose it.
formattedText=saveSpace(formattedText); formattedText=saveSpace(formattedText);
#ifdef USE_CMARK
if (flag & RSHTML_FORMATTEXT_USE_CMARK) { if (flag & RSHTML_FORMATTEXT_USE_CMARK) {
// Transform html to plain text // Transform html to plain text
QTextBrowser textBrowser; QTextBrowser textBrowser;
@ -608,6 +614,7 @@ QString RsHtml::formatText(QTextDocument *textDocument, const QString &text, ulo
textBrowser.setHtml(formattedText); textBrowser.setHtml(formattedText);
formattedText=textBrowser.toHtml(); formattedText=textBrowser.toHtml();
} }
#endif
QString errorMsg; int errorLine; int errorColumn; QString errorMsg; int errorLine; int errorColumn;

8
retroshare.pri
View File

@ -30,11 +30,19 @@ no_retroshare_gui:CONFIG -= retroshare_gui
CONFIG *= gxsdistsync CONFIG *= gxsdistsync
# disabled by the time we fix compilation
CONFIG *= no_cmark
# To disable RetroShare-nogui append the following # To disable RetroShare-nogui append the following
# assignation to qmake command line "CONFIG+=no_retroshare_nogui" # assignation to qmake command line "CONFIG+=no_retroshare_nogui"
CONFIG *= retroshare_nogui CONFIG *= retroshare_nogui
no_retroshare_nogui:CONFIG -= retroshare_nogui no_retroshare_nogui:CONFIG -= retroshare_nogui
# To disable cmark append the following
# assignation to qmake command line "CONFIG+=no_cmark"
CONFIG *= cmark
no_cmark:CONFIG -= cmark
# To enable RetroShare plugins append the following # To enable RetroShare plugins append the following
# assignation to qmake command line "CONFIG+=retroshare_plugins" # assignation to qmake command line "CONFIG+=retroshare_plugins"
CONFIG *= no_retroshare_plugins CONFIG *= no_retroshare_plugins