Revert the merge revert

This reverts commit 3c2414028b.
2024-01-06 18:21:41 +01:00
parent 3c2414028b
commit 16b6d43786
127 changed files with 769 additions and 1746 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ before_install:
 - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
 - sudo apt-get update -qq
 - sudo apt-get install libsodium-dev pkg-config
- - sudo apt-get install qt514base qt514websockets libgl1-mesa-dev
+ - sudo apt-get install qt514base libgl1-mesa-dev
 - source /opt/qt514/bin/qt514-env.sh
 - chmod +x res/libsodium/buildlibsodium.sh