Merge master into develop

docs/reference/changelog-r2025.md

@@ -3,6 +3,8 @@
 ## Webots R2025b
   - Bug Fixes
     - Fixed a bug preventing the `webots-controller` executable from running on arm-based mac devices ([#6806](https://github.com/cyberbotics/webots/pull/6806)).
+    - Fixed a bug causing Webots to crash when multiple sounds were used with a [Speaker](speaker.md) node ([#6843](https://github.com/cyberbotics/webots/pull/6843)).
+    - Fixed a bug causing the "Reload/Reset" buttons in the controller recompilation popup to not work on Windows ([#6844](https://github.com/cyberbotics/webots/pull/6844)).
 
 ## Webots R2025a
 Released on January 31st, 2025.

projects/samples/contests/ratslife/controllers/contest_manager/maze_definition.h

@@ -21,7 +21,7 @@
 #ifndef MAZE_DEFINITION_H
 #define MAZE_DEFINITION_H
 
-#include "boolean.h"
+#include <stdbool.h>
 #include "linked_list.h"
 // enum
 typedef enum { North, South, East, West, None } Orientation;

projects/samples/contests/ratslife/controllers/contest_manager/round_manager.c

@@ -20,7 +20,7 @@
 
 #include "round_manager.h"
 
-#include "boolean.h"
+#include <stdbool.h>
 #include "helper.h"
 
 #include <math.h>

projects/samples/contests/ratslife/controllers/contest_manager/texture_generator.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "boolean.h"
+#include <stdbool.h>
 #include "helper.h"
 #include "parameters.h"
 #include "texture_generator.h"

src/controller/c/speaker.c

@@ -258,17 +258,17 @@ static void speaker_write_request(WbDevice *d, WbRequest *r) {
           request_write_char(r, 1);
         else
           request_write_char(r, 0);
-      }
 
-      request_write_int32(r, sound->upload_size);
-      if (sound->upload_size) {
-        /* Sound data available to stream, send it one time and discard it.
-         * Webots will cache the data inside the device.
-         */
-        request_write_data(r, sound->upload_data, sound->upload_size);
-        free(sound->upload_data);
-        sound->upload_data = NULL;
-        sound->upload_size = 0;
+        request_write_int32(r, sound->upload_size);
+        if (sound->upload_size) {
+          /* Sound data available to stream, send it one time and discard it.
+           * Webots will cache the data inside the device.
+           */
+          request_write_data(r, sound->upload_data, sound->upload_size);
+          free(sound->upload_data);
+          sound->upload_data = NULL;
+          sound->upload_size = 0;
+        }
       }
 
       sound->need_update = false;

src/webots/editor/WbBuildEditor.cpp

@@ -28,6 +28,7 @@
 #include "../../../include/controller/c/webots/utils/ansi_codes.h"
 
 #include <QtGui/QAction>
+#include <QtWidgets/QPushButton>
 #include <QtWidgets/QToolBar>
 #include <QtWidgets/QToolButton>
 
@@ -268,12 +269,16 @@ void WbBuildEditor::reloadMessageBoxIfNeeded() {
       if (WbMessageBox::enabled()) {
         QMessageBox messageBox(QMessageBox::Question, tr("Compilation successful"),
                                tr("Do you want to reset or reload the world?"), QMessageBox::Cancel, this);
-        messageBox.addButton(tr("Reload"), QMessageBox::AcceptRole);
-        messageBox.setDefaultButton(messageBox.addButton(tr("Reset"), QMessageBox::AcceptRole));
-        const int ret = messageBox.exec();
-        if (ret == 0)
+        const QPushButton *reloadButton = messageBox.addButton(tr("Reload"), QMessageBox::AcceptRole);
+        QPushButton *resetButton = messageBox.addButton(tr("Reset"), QMessageBox::AcceptRole);
+        messageBox.setDefaultButton(resetButton);
+
+        messageBox.exec();
+
+        const QAbstractButton *clickedButton = messageBox.clickedButton();
+        if (clickedButton == reloadButton)
           emit reloadRequested();
-        else if (ret == 1)
+        else if (clickedButton == resetButton)
           emit resetRequested();
       }
     } else

src/webots/wren/WbWrenTextureOverlay.cpp

@@ -272,7 +272,15 @@ WrTexture2d *WbWrenTextureOverlay::createIconTexture(QString filePath) {
     return imageTexture;
 
   QImageReader imageReader(filePath);
-  QImage image = imageReader.read().mirrored(false, true);  // account for inverted Y axis in OpenGL
+  QImage image = imageReader.read();
+
+  // account for inverted Y axis in OpenGL
+#ifdef _WIN32  // Windows builds against a newer version of Qt, which deprecates `mirrored`
+  image = image.flipped(Qt::Vertical);
+#else
+  image = image.mirrored(false, true);
+#endif
+
   const bool isTranslucent = image.pixelFormat().alphaUsage() == QPixelFormat::UsesAlpha;
 
   imageTexture = wr_texture_2d_new();