Merge pull request #6931 from cyberbotics/sync-master-23d9d8bae

Merge master into develop

Author: omichel

resources/translations/Makefile

@@ -1,4 +1,4 @@
-# Copyright 1996-2025 Cyberbotics Ltd.
+# Copyright 1996-2026 Cyberbotics Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,9 +37,14 @@ include $(WEBOTS_HOME_PATH)/resources/Makefile.os.include
 WEBOTS_SRC_PATH = $(WEBOTS_HOME_PATH)/src/webots
 
 ifeq ($(OSTYPE),windows)
+ifdef CI
 LUPDATE = lupdate-qt6
 LRELEASE = lrelease-qt6
 else
+LUPDATE = lupdate
+LRELEASE = lrelease
+endif
+else
 QT_BINARIES_PATH = $(WEBOTS_HOME_PATH)/bin/qt
 
 ifeq ($(OSTYPE),linux)

scripts/install/msys64_installer.sh

@@ -15,7 +15,7 @@ declare -a BASE_PACKAGES=(
   "zip"                               # robotbenchmark square path
   "mingw-w64-x86_64-qt6-base"         # Webots
   "mingw-w64-x86_64-qt6-declarative"  # Webots
-  "mingw-w64-x86_64-qt6-tools"        # Webots (translation: lrelease-qt6 and lupdate-qt6)
+  "mingw-w64-x86_64-qt6-tools"        # Webots (translation: lrelease and lupdate)
   "mingw-w64-x86_64-qt6-translations" # Webots
   "mingw-w64-x86_64-qt6-websockets"   # Webots
   "mingw-w64-x86_64-libzip"           # Webots

src/webots/nodes/WbBackground.cpp

@@ -638,12 +638,11 @@ void WbBackground::applySkyBoxToWren() {
     } else {  // otherwise, use a small uniform texture with the color of the sky
       cm = wr_texture_cubemap_new();
       size = 2;
-      const int size2 = size * size;
       wr_texture_set_internal_format(WR_TEXTURE(cm), WR_TEXTURE_INTERNAL_FORMAT_RGBA8);
-      unsigned int data[size2];
+      unsigned int data[4];
       const WbRgb &c = skyColor();
       unsigned int color = c.redByte() * 0x10000 + c.greenByte() * 0x100 + c.blueByte();
-      for (int i = 0; i < size2; i++)
+      for (int i = 0; i < 4; i++)
         data[i] = color;
       for (int i = 0; i < 6; i++)
         wr_texture_cubemap_set_data(cm, reinterpret_cast<const char *>(data), static_cast<WrTextureOrientation>(i));