Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added compatibility with Qt >=5 in utils.cpp #24

Merged
merged 1 commit into from
Feb 17, 2014
Merged

Added compatibility with Qt >=5 in utils.cpp #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/api/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <QStringBuilder>
#include <QTextDocument>
#include <QUrl>
#include <QtGlobal>

//#define MAX_ENTITY 258
//extern const struct QTextHtmlEntity { const char *name; quint16 code; } entities[MAX_ENTITY];
Expand Down Expand Up @@ -66,7 +67,11 @@ QString fromHtmlEntities(const QString &source)

QString toHtmlEntities(const QString &source)
{
#if QT_VERSION>=0x5
return source.toHtmlEscaped();
#else
return Qt::escape(source);
#endif
}

} //namespace Vreen
Expand Down