Skip to content

Commit

Permalink
Upgrade QT to 6.4.3 on MacOS (#6157)
Browse files Browse the repository at this point in the history
* upgrade QT to 6.4.3 on MacOS

* Update changelog-r2023.md

* Update changelog-r2023.md

* remove rw

* fix path

* Update docs/reference/changelog-r2023.md

Co-authored-by: Yannick Goumaz <[email protected]>

---------

Co-authored-by: Yannick Goumaz <[email protected]>
  • Loading branch information
Benjamin Délèze and ygoumaz authored Jun 7, 2023
1 parent 4a79428 commit 01cf14f
Show file tree
Hide file tree
Showing 31 changed files with 12 additions and 2,097 deletions.
4 changes: 2 additions & 2 deletions dependencies/Makefile.mac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WEBOTS_HOME_LIB = $(WEBOTS_HOME)/Contents/lib/webots
DEPENDENCIES_URL = https://cyberbotics.com/files/repository/dependencies/mac/release
WGET = LANG=en_US.UTF-8 wget -qq

QT_PACKAGE = qt-6.2.3-release.tar.bz2
QT_PACKAGE = qt-6.4.3-release.tar.bz2
ASSIMP_PACKAGE = assimp-5.2.3.tar.bz2
FFMPEG_PACKAGE = ffmpeg.tar.bz2
FREETYPE_PACKAGE = freetype2.tar.bz2
Expand Down Expand Up @@ -72,7 +72,7 @@ $(WEBOTS_DEPENDENCY_PATH)/$(QT_PACKAGE):
@echo "# downloading $(QT_PACKAGE)"
@rm -f $(WEBOTS_DEPENDENCY_PATH)/$(QT_PACKAGE)
@$(WGET) $(DEPENDENCIES_URL)/$(QT_PACKAGE) -P $(WEBOTS_DEPENDENCY_PATH)
@if [ "4b9acde6a2e0b611851c5a1bb388d3ef" != `md5 -q $(QT_PACKAGE)` ]; then echo "MD5 checksum failed for $(QT_PACKAGE)"; exit 1; fi
@if [ "71c339a01c8cf324bc8c00b39d6fbd1e" != `md5 -q $(QT_PACKAGE)` ]; then echo "MD5 checksum failed for $(QT_PACKAGE)"; exit 1; fi
@touch $(WEBOTS_DEPENDENCY_PATH)/$(QT_PACKAGE)

assimp-clean:
Expand Down
4 changes: 3 additions & 1 deletion docs/reference/changelog-r2023.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Released on ??
- Disable `Select..` button in SFString editor if the field has restricted values ([5663](https://github.com/cyberbotics/webots/pull/5663)).
- Improved plot representation in default robot window when a NaN value is received from a device ([#5680](https://github.com/cyberbotics/webots/pull/5680)).
- Improved default selected tab in Field Editor when nodes are selected ([#5726](https://github.com/cyberbotics/webots/pull/5726)).
- Change the Windows version of SUMO to 1.13 to match the one used on Linux and MacOS and avoid a potiental Log4J vulnerability ([#6010](https://github.com/cyberbotics/webots/pull/6010)).
- Added `proto_formatter.py` script to automatically indent PROTO files ([#6167](https://github.com/cyberbotics/webots/pull/6167)).
- Bug Fixes
- Fixed the MATLAB `wb_camera_recognition_get_objects` API function ([#6172](https://github.com/cyberbotics/webots/pull/6172)).
Expand Down Expand Up @@ -67,6 +66,9 @@ Released on ??
- Fixed conversion of joints' axis in `pedal_racer.wbt` to FLU/ENU coordinate system ([#6115](https://github.com/cyberbotics/webots/pull/6115)).
- Fixed a bug in ODE that caused minStop and maxStop limits to be violated in HingeJoints ([#6118](https://github.com/cyberbotics/webots/pull/6118)).
- Fixed errors loading template PROTO if the system user name contains the `'` character ([#6131](https://github.com/cyberbotics/webots/pull/6131)).
- Dependency Updates
- Change the Windows version of SUMO to 1.13 to match the one used on Linux and macOS and avoid a potiental Log4J vulnerability ([#6010](https://github.com/cyberbotics/webots/pull/6010)).
- Upgraded to Qt6.4.3 on Ubuntu ([#6065](https://github.com/cyberbotics/webots/pull/6065)) and macOS ([#6157](https://github.com/cyberbotics/webots/pull/6157)).

## Webots R2023a
Released on November 29th, 2022.
Expand Down
3 changes: 1 addition & 2 deletions projects/robots/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ CONTROLLERS=\
unimation/puma/controllers.Makefile \
universal_robots/controllers.Makefile

ROBOT_WINDOWS=gctronic/e-puck/plugins/robot_windows.Makefile \
robotis/darwin-op/plugins/robot_windows.Makefile
ROBOT_WINDOWS=gctronic/e-puck/plugins/robot_windows.Makefile

REMOTE_CONTROLS=gctronic/e-puck/plugins/remote_controls.Makefile \
robotis/darwin-op/plugins/remote_controls.Makefile
Expand Down
47 changes: 0 additions & 47 deletions projects/robots/robotis/darwin-op/plugins/robot_windows/Makefile

This file was deleted.

This file was deleted.

Loading

0 comments on commit 01cf14f

Please sign in to comment.