diff --git a/HomeAutomation/HomeAutom.pro b/HomeAutomation/HomeAutom.pro index e0b724c95370844d5ddf6f0c72ba11722a82b03a..75c3afbcbd4f920ff769fdd27368b7a90c026cae 100644 --- a/HomeAutomation/HomeAutom.pro +++ b/HomeAutomation/HomeAutom.pro @@ -12,7 +12,7 @@ KNX_BOARD { CONFIG += c++11 } -QT += qml quick +QT += qml quick 3dstudioruntime2 CONFIG += resources_big diff --git a/HomeAutomation/main.cpp b/HomeAutomation/main.cpp index 5f39d93c4e2eff1caff0abf51c848da7a1f2251f..cf1214a1e1cee224378f11dc5e4173cab7385ad7 100644 --- a/HomeAutomation/main.cpp +++ b/HomeAutomation/main.cpp @@ -59,6 +59,7 @@ #if defined(KNX_BACKEND) #include "qmlknxdemo.h" #endif +#include // Uncomment for 1280x900 window //#define FIXEDWINDOW @@ -75,18 +76,10 @@ int applyRatio(const int value, const int ratio) int main(int argc, char *argv[]) { -#if defined(Q_OS_MACOS) - QSurfaceFormat openGLFormat; - openGLFormat.setRenderableType(QSurfaceFormat::OpenGL); - openGLFormat.setProfile(QSurfaceFormat::CoreProfile); - openGLFormat.setMajorVersion(4); - openGLFormat.setMinorVersion(1); - openGLFormat.setStencilBufferSize(8); - QSurfaceFormat::setDefaultFormat(openGLFormat); -#endif - QGuiApplication app(argc, argv); + QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat()); + // Define size variants for scaling qreal refDpi = 96.; qreal refWidth = 1280.; diff --git a/HomeAutomation/qml/HomeAutom/HomeView.qml b/HomeAutomation/qml/HomeAutom/HomeView.qml index 5ea1c40b2d2ce1cf3c18affdba06479bd1b0deb7..2e5260010b3cf06ffe5b9726be97fa14b192c919 100644 --- a/HomeAutomation/qml/HomeAutom/HomeView.qml +++ b/HomeAutomation/qml/HomeAutom/HomeView.qml @@ -50,7 +50,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 -import QtStudio3D 1.1 +import QtStudio3D 2.0 Item { id: home diff --git a/kria-cluster-3d-demo/kria3dclusterdemo.pro b/kria-cluster-3d-demo/kria3dclusterdemo.pro index beca73e0225fe27bd91d64762be601e8d9bdb3ce..198ad2cba688a172195767310ff011de36ebfad7 100644 --- a/kria-cluster-3d-demo/kria3dclusterdemo.pro +++ b/kria-cluster-3d-demo/kria3dclusterdemo.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick +QT += qml quick 3dstudioruntime2 target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET INSTALLS += target diff --git a/kria-cluster-3d-demo/main.cpp b/kria-cluster-3d-demo/main.cpp index 5c2b0eca2444a22604fba8db923ea201f3e5f69e..c15022adcc2ff948dc7214c16659bd09bf97b0f7 100644 --- a/kria-cluster-3d-demo/main.cpp +++ b/kria-cluster-3d-demo/main.cpp @@ -53,24 +53,17 @@ #include #include #include +#include int main(int argc, char *argv[]) { -#if defined(Q_OS_MACOS) - QSurfaceFormat openGLFormat; - openGLFormat.setRenderableType(QSurfaceFormat::OpenGL); - openGLFormat.setProfile(QSurfaceFormat::CoreProfile); - openGLFormat.setMajorVersion(4); - openGLFormat.setMinorVersion(1); - openGLFormat.setStencilBufferSize(8); - QSurfaceFormat::setDefaultFormat(openGLFormat); -#endif - qputenv("QML_DISABLE_DISK_CACHE", "true"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); + QSurfaceFormat::setDefaultFormat(Q3DS::surfaceFormat()); + QQuickView viewer; QFontDatabase::addApplicationFont("qrc:/qml/fonts/TitilliumWeb-SemiBold.ttf"); diff --git a/kria-cluster-3d-demo/qml/main.qml b/kria-cluster-3d-demo/qml/main.qml index e8f0cc101890fd9f579ee0013a68e88ddeb0ad81..cc087acdd906ee93dbf312a2f47c16c61c4ad624 100644 --- a/kria-cluster-3d-demo/qml/main.qml +++ b/kria-cluster-3d-demo/qml/main.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.9 -import QtStudio3D 1.1 +import QtStudio3D 2.0 import QtQuick.Controls 2.1 Item {