From 257e98917c2b9c1bc06272eb663a73ee57c094c1 Mon Sep 17 00:00:00 2001 From: Harri Porten Date: Fri, 11 Oct 2013 08:07:27 +0200 Subject: Re-add deprecated symbol for ABI compatibility with Qt 5.1. When b0b786a2f05e9451a65519ab8904f55c35f51b7d deprecated QFontDatabase::supportsThreadedFontRendering() it made the function inline also. That way compilers like gcc did not export the symbol anymore. Change-Id: If9c343eaa2ff90540decbc19b0af33d439c0bbaa Reviewed-by: Konstantin Ritt Reviewed-by: Lars Knoll --- src/gui/text/qfontdatabase.h | 2 +- src/gui/text/qfontdatabase_qpa.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 4e8f718962..708b8cbd58 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -151,7 +151,7 @@ public: static bool removeAllApplicationFonts(); #if QT_DEPRECATED_SINCE(5, 2) - QT_DEPRECATED static inline bool supportsThreadedFontRendering() { return true; } + QT_DEPRECATED static bool supportsThreadedFontRendering(); #endif static QFont systemFont(SystemFont type); diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index 7f5281131e..6c0be950dc 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/src/gui/text/qfontdatabase_qpa.cpp @@ -267,6 +267,12 @@ bool QFontDatabase::removeAllApplicationFonts() return true; } +// QT_DEPRECATED_SINCE(5, 2) +bool QFontDatabase::supportsThreadedFontRendering() +{ + return true; +} + /*! \internal */ -- cgit v1.2.3