diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-11-20 17:26:26 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2021-01-05 16:03:03 +0000 |
| commit | 090ea5502eac39565e33b3882f2173dd5eae473d (patch) | |
| tree | e79db00cd7cc50e83bbce5adc06ddda59aa30224 /examples/qt3d/3d-text | |
| parent | 173be1a93699c54d9680d809ca5a56ce0ccccd9a (diff) | |
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 <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/3d-text')
| -rw-r--r-- | examples/qt3d/3d-text/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |