diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2022-05-13 22:42:08 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2022-07-01 12:41:23 +0000 |
| commit | 4c845c092c550d118d7ca3a4ca863aa94ec78882 (patch) | |
| tree | 1aa7f8f1ac8a0a487b7082bfea1b0c26d53f4609 /am-config-neptune.yaml | |
| parent | df878f3935fe28dd3d7253b9fa59d65db331eed0 (diff) | |
Port to Qt 6.2
- Build is warning free on Linux
- Still using qmake
- Custom fragmenShaders in the cluster are not ported yet
- Qt 3D models are rendered, but the Studio 3D integration is untested
Change-Id: I0e410a932d6461ba29e7c945cb5e9750d6df8964
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Bramastyo Harimukti Santoso <bram.harimukti@gmail.com>
Diffstat (limited to 'am-config-neptune.yaml')
| -rw-r--r-- | am-config-neptune.yaml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/am-config-neptune.yaml b/am-config-neptune.yaml index cc17eb7b..d173756c 100644 --- a/am-config-neptune.yaml +++ b/am-config-neptune.yaml @@ -15,12 +15,12 @@ applications: runtimes: qml: - importPaths: [ "${CONFIG_PWD}/imports_shared" ] + importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/styles" ] environmentVariables: QT_PLUGIN_PATH: "${CONFIG_PWD}" SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf" native: - importPaths: [ "${CONFIG_PWD}/imports_shared" ] + importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/styles" ] environmentVariables: QT_PLUGIN_PATH: "${CONFIG_PWD}" SERVER_CONF_PATH: "${CONFIG_PWD}/server.conf" @@ -29,11 +29,11 @@ runtimes: ui: fullscreen: no - style: "${CONFIG_PWD}/styles/neptune" + style: "NeptuneStyle" iconThemeName: "neptune" iconThemeSearchPaths: [ "${CONFIG_PWD}/imports_shared/assets/icons" ] mainQml: "${CONFIG_PWD}/Main.qml" - importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui" ] + importPaths: [ "${CONFIG_PWD}/imports_shared", "${CONFIG_PWD}/imports_system", "${CONFIG_PWD}/sysui", "${CONFIG_PWD}/styles" ] windowIcon: "${CONFIG_PWD}/imports_shared/assets/icons/neptune/sysui/ic-menu-home.png" enableTouchEmulation: yes @@ -75,5 +75,6 @@ logging: - "cursor.navigation=false" - "qt3ds.*=false" - "shared.com.pelagicore.map.info=false" - - "*.warning=false" + - "*.info=true" + - "*.warning=true" - "*.critical=true" |