diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-14 10:17:39 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-16 11:59:10 -0700 |
commit | fc3ac31891d254d634fc9a776a2ebeb6d1c3cc77 (patch) | |
tree | f7e4478eea7cee039b41e7b18d7c6e799365532c | |
parent | d91b2a4479dc92d7b1232e42329977e909331909 (diff) |
QFontDatabase: suppress warning about its constructor being deprecated
qmetatype.h:2263:76: warning: 'QFontDatabase' is deprecated: Call the static functions instead [-Wdeprecated-declarations]
...
moc_qfontdatabase.cpp:159:1: note: in instantiation of variable template specialization 'qt_incomplete_metaTypeArray<qt_meta_stringdata_QFontDatabase_t, QtPrivate::TypeAndForceComplete<QFontDatabase, std::integral_constant<bool, true>>>' requested here
qfontdatabase.h:113:7: note: 'QFontDatabase' has been explicitly marked deprecated here
Change-Id: Iea05060bc2c046928536fffd16adf537be122db2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | src/gui/text/qfontdatabase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 79ace4e35b..d0d2cfa629 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -109,7 +109,7 @@ public: static QList<int> standardSizes(); -#if QT_DEPRECATED_SINCE(6, 0) +#if QT_DEPRECATED_SINCE(6, 0) && !defined(QT_BUILD_GUI_LIB) QT_DEPRECATED_VERSION_X_6_0("Call the static functions instead") explicit QFontDatabase() = default; #else QFontDatabase() = delete; |