diff options
author | Slávek Banko <[email protected]> | 2016-09-18 20:13:23 +0200 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2016-09-18 20:16:12 +0200 |
commit | 0a78c9adbf4ec3cf77bad3a803706a10cc07b432 (patch) | |
tree | b7d5f2e0bc882ee7225879bb3cb58dfd420aa209 /src/rtf2html | |
parent | 024330fca86b8ab53d7dd7e7d05206cdc99807a2 (diff) | |
download | tellico-0a78c9adbf4ec3cf77bad3a803706a10cc07b432.tar.gz tellico-0a78c9adbf4ec3cf77bad3a803706a10cc07b432.zip |
Fix build with KDE_DEFAULT_CXXFLAGS
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 5eb938208e3ef0f9c2d8aecde27d03cd4564e255)
Diffstat (limited to 'src/rtf2html')
-rw-r--r-- | src/rtf2html/rtf2html.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/rtf2html/rtf2html.cpp b/src/rtf2html/rtf2html.cpp index e6e8b34..eec9caa 100644 --- a/src/rtf2html/rtf2html.cpp +++ b/src/rtf2html/rtf2html.cpp @@ -14,6 +14,12 @@ * * ***************************************************************************/ +// force to use QT with STL +#if defined(QT_NO_STL) +# define DISABLE_QT_NO_STL +# undef QT_NO_STL +#endif + #include "rtf2html.h" #include "rtf_table.h" #include "rtf_tools.h" @@ -529,3 +535,8 @@ TQString RTF2HTML::toHTML() const { return html; } +// restore QT_NO_STL +#if defined(DISABLE_QT_NO_STL) +# undef DISABLE_QT_NO_STL +# define QT_NO_STL +#endif |