Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
branch = master
[submodule "thirdparty/gamepad/gamepad"]
path = thirdparty/gamepad/gamepad
url = https://github.com/trikset/trik-desktop-gamepad
branch = master
url = https://github.com/MinyazevR/trik-desktop-gamepad
branch = MinyazevR-trik-desktop-gamepad
[submodule "plugins/robots/thirdparty/hidapi"]
path = plugins/robots/thirdparty/hidapi
url = https://github.com/libusb/hidapi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ rsync -a "$INSTALLER_ROOT"/licenses/acknowledgements.txt "$P

mkdir -p "$PWD"/../data/platforms
mkdir -p "$PWD"/../data/imageformats
mkdir -p "$PWD"/../data/mediaservice
mkdir -p "$PWD"/../data/iconengines
mkdir -p "$PWD"/../data/plugins/tools
mkdir -p "$PWD"/../data/scripts/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ mkdir -p "$PWD"/../data/bin/
mkdir -p "$PWD"/../data/resources/
mkdir -p "$PWD"/../data/bin/platforms/
mkdir -p "$PWD"/../data/bin/imageformats/
mkdir -p "$PWD"/../data/bin/mediaservice/
mkdir -p "$PWD"/../data/bin/iconengines/
mkdir -p "$PWD"/../data/lib/plugins/tools/

Expand Down Expand Up @@ -54,13 +55,14 @@ rsync -a "$QT_LIB"/libQt5XcbQpa.so* "$PWD"/.
rsync -a "$QT_LIB"/libQt5WaylandC{lient,ompositor}.so* "$PWD"/../data/lib/
rsync -a "$QT_LIB"/libQt5Concurrent.so* "$PWD"/../data/lib/

rsync -avR "$QT_PLUGINS"/./{platforms,imageformats,iconengines,wayland-*}/lib*.so "$PWD"/../data/bin/
rsync -avR "$QT_PLUGINS"/./{mediaservice,platforms,imageformats,iconengines,wayland-*}/lib*.so "$PWD"/../data/bin/

mv "$PWD"/../data/acknowledgements.txt "$PWD"/../data/resources/
mv "$PWD"/../data/changelog.txt "$PWD"/../data/resources/

# Cleaning up prebuild-common.sh results...
rm -rf "$PWD"/../data/imageformats/
rm -rf "$PWD"/../data/mediaservice/
rm -rf "$PWD"/../data/iconengines/
rm -rf "$PWD"/../data/platforms/
rm -rf "$PWD"/../data/plugins/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ rsync -a "$QT_LIB"/../plugins/platforms/q{windows,offscreen,minimal}.dll
rsync -a "$QT_LIB"/../plugins/imageformats/qsvg.dll "$PWD"/../data/imageformats
rsync -a "$QT_LIB"/../plugins/imageformats/qjpeg.dll "$PWD"/../data/imageformats
rsync -a "$QT_LIB"/../plugins/iconengines/qsvgicon.dll "$PWD"/../data/iconengines
rsync -a "$QT_LIB"/../plugins/mediaservice/ "$PWD"/../data/mediaservice/
2 changes: 1 addition & 1 deletion thirdparty/gamepad/gamepad
Submodule gamepad updated 2 files
+18 −8 gamepadForm.cpp
+5 −1 gamepadForm.h
Loading