From 090ea5502eac39565e33b3882f2173dd5eae473d Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Fri, 20 Nov 2020 17:26:26 +0000 Subject: Enable compiling non-QML API against Qt 5.15 Built with QtQuick disabled. - C++17 required - minor issues with QList vs QVector - QMutexLocker templated vs not - moc forward declaration handling Change-Id: I5540625e74e2c009e528f56203e4b88be8d54599 Reviewed-by: Paul Lemire --- examples/qt3d/3d-text/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'examples/qt3d/3d-text') diff --git a/examples/qt3d/3d-text/main.cpp b/examples/qt3d/3d-text/main.cpp index 01243509b..8f13c24d7 100644 --- a/examples/qt3d/3d-text/main.cpp +++ b/examples/qt3d/3d-text/main.cpp @@ -81,7 +81,11 @@ int main(int argc, char *argv[]) auto *textMaterial = new Qt3DExtras::QPhongMaterial(root); { // text int i = 0; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QStringList fonts = QFontDatabase::families(); +#else + const QStringList fonts = QFontDatabase().families(); +#endif for (const QString &family : fonts) { -- cgit v1.2.3