diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-08 17:10:48 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-08 17:10:48 +0200 |
| commit | 8fd1ea6128ec9208c275d508fc8c01cddf7867a3 (patch) | |
| tree | 4917371ce21256ad2dcac9b61cae4900ad3eadf6 /examples/quick3d | |
| parent | 889447b1f96230f9043422a8ad1a6202854235d8 (diff) | |
| parent | d4b7b29b146b7315e1cccdd366c2558f7da42dd5 (diff) | |
Merge tag 'v6.5.8-lts' into tqtc/lts-6.5-opensourcev6.5.8-lts-lgpl6.5
Qt 6.5.8-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Ic999274db791b5ce4577ff75c7882aee23a100b9
Diffstat (limited to 'examples/quick3d')
| -rw-r--r-- | examples/quick3d/bakedlightmap/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/customeffect/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/customshaders/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/dynamiccreation/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/picking/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/principledmaterial/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/reflectionprobes/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/screenspacereflections/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/simplefog/main.cpp | 2 | ||||
| -rw-r--r-- | examples/quick3d/view3d/main.cpp | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/examples/quick3d/bakedlightmap/main.cpp b/examples/quick3d/bakedlightmap/main.cpp index 604e282c..d139eb98 100644 --- a/examples/quick3d/bakedlightmap/main.cpp +++ b/examples/quick3d/bakedlightmap/main.cpp @@ -7,9 +7,9 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/customeffect/main.cpp b/examples/quick3d/customeffect/main.cpp index 64d595cd..081201e1 100644 --- a/examples/quick3d/customeffect/main.cpp +++ b/examples/quick3d/customeffect/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/customshaders/main.cpp b/examples/quick3d/customshaders/main.cpp index cc42da40..46832d52 100644 --- a/examples/quick3d/customshaders/main.cpp +++ b/examples/quick3d/customshaders/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat(4)); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/dynamiccreation/main.cpp b/examples/quick3d/dynamiccreation/main.cpp index cc42da40..46832d52 100644 --- a/examples/quick3d/dynamiccreation/main.cpp +++ b/examples/quick3d/dynamiccreation/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat(4)); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/picking/main.cpp b/examples/quick3d/picking/main.cpp index 64d595cd..081201e1 100644 --- a/examples/quick3d/picking/main.cpp +++ b/examples/quick3d/picking/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/principledmaterial/main.cpp b/examples/quick3d/principledmaterial/main.cpp index 64d595cd..081201e1 100644 --- a/examples/quick3d/principledmaterial/main.cpp +++ b/examples/quick3d/principledmaterial/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/reflectionprobes/main.cpp b/examples/quick3d/reflectionprobes/main.cpp index b77c911b..73a4d5dc 100644 --- a/examples/quick3d/reflectionprobes/main.cpp +++ b/examples/quick3d/reflectionprobes/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; const QUrl url(QStringLiteral("qrc:/main.qml")); diff --git a/examples/quick3d/screenspacereflections/main.cpp b/examples/quick3d/screenspacereflections/main.cpp index b77c911b..73a4d5dc 100644 --- a/examples/quick3d/screenspacereflections/main.cpp +++ b/examples/quick3d/screenspacereflections/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; const QUrl url(QStringLiteral("qrc:/main.qml")); diff --git a/examples/quick3d/simplefog/main.cpp b/examples/quick3d/simplefog/main.cpp index fef0d605..e945dfe1 100644 --- a/examples/quick3d/simplefog/main.cpp +++ b/examples/quick3d/simplefog/main.cpp @@ -9,10 +9,10 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/quick3d/view3d/main.cpp b/examples/quick3d/view3d/main.cpp index 804f8ff4..f0320b96 100644 --- a/examples/quick3d/view3d/main.cpp +++ b/examples/quick3d/view3d/main.cpp @@ -7,9 +7,9 @@ int main(int argc, char *argv[]) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QGuiApplication app(argc, argv); QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); - qputenv("QT_QUICK_CONTROLS_STYLE", "Basic"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); |