diff --git a/.gitmodules b/.gitmodules index eab587d050..6197d47618 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,32 +1,39 @@ [submodule "plugins/robots/thirdparty/trikRuntime"] path = plugins/robots/thirdparty/trikRuntime/trikRuntime url = https://github.com/trikset/trikRuntime + branch = master [submodule "qrtest/thirdparty/googletest/googletest"] path = qrtest/thirdparty/googletest/googletest url = https://github.com/google/googletest + branch = main [submodule "qrgui/thirdparty/qt-solutions"] path = qrgui/thirdparty/qt-solutions url = https://github.com/trikset/qt-solutions + branch = master [submodule "thirdparty/gamepad/gamepad"] path = thirdparty/gamepad/gamepad url = https://github.com/trikset/trik-desktop-gamepad + branch = master [submodule "plugins/robots/thirdparty/hidapi"] path = plugins/robots/thirdparty/hidapi url = https://github.com/libusb/hidapi [submodule "thirdparty/quazip/quazip"] path = thirdparty/quazip/quazip url = https://github.com/stachenov/quazip.git + branch = master [submodule "plugins/robots/thirdparty/Box2D/Box2D"] path = plugins/robots/thirdparty/Box2D/Box2D url = https://github.com/iakov/Box2D branch = "trik-studio" [submodule "thirdparty/qslog/qslog"] path = thirdparty/qslog/qslog - url = https://bitbucket.org/codeimproved/qslog.git + url = https://github.com/trikset/trik-qslog.git + branch = codeimproved-master [submodule "installer/nxt-tools"] path = installer/nxt-tools url = https://github.com/trikset/nxt-tools.git - branch = main + branch = master [submodule "trik-checkapp"] path = thirdparty/checkapp/checkapp url = https://github.com/trikset/trik-checkapp + branch = master diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt index 6eb9e06a95..db7f451fc3 100644 --- a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt +++ b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt @@ -1,4 +1,4 @@ -pyinstaller==6.11.1 -numpy==2.2.2; python_version >= "3.11" +pyinstaller==6.12.0 +numpy==2.2.3; python_version >= "3.11" numpy==2.0.1; python_version < "3.11" diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime b/plugins/robots/thirdparty/trikRuntime/trikRuntime index 4f5243c454..e1e494a9f4 160000 --- a/plugins/robots/thirdparty/trikRuntime/trikRuntime +++ b/plugins/robots/thirdparty/trikRuntime/trikRuntime @@ -1 +1 @@ -Subproject commit 4f5243c454f07e4335ec45fc262fe639bf456c09 +Subproject commit e1e494a9f483400de87de6b20634510ef4fb34e3 diff --git a/qrtest/thirdparty/googletest/googletest b/qrtest/thirdparty/googletest/googletest index e235eb34c6..a6ce08abf7 160000 --- a/qrtest/thirdparty/googletest/googletest +++ b/qrtest/thirdparty/googletest/googletest @@ -1 +1 @@ -Subproject commit e235eb34c6c4fed790ccdad4b16394301360dcd4 +Subproject commit a6ce08abf746c0aaa577520d6d1f6ea2abeeb61d diff --git a/qrtest/thirdparty/googletest/googletest.pro b/qrtest/thirdparty/googletest/googletest.pro index 561100f28b..dd444649ec 100644 --- a/qrtest/thirdparty/googletest/googletest.pro +++ b/qrtest/thirdparty/googletest/googletest.pro @@ -18,6 +18,7 @@ TEMPLATE = lib include(../../../global.pri) LIBS -= -ltrikQsLog +CONFIG += c++17 # CONFIG += warn_off diff --git a/thirdparty/qslog/QsLogSharedLibrary.pro b/thirdparty/qslog/QsLogSharedLibrary.pro index 45df51b10e..05529e3c1c 100644 --- a/thirdparty/qslog/QsLogSharedLibrary.pro +++ b/thirdparty/qslog/QsLogSharedLibrary.pro @@ -2,8 +2,13 @@ DEFINES += QSLOG_IS_SHARED_LIBRARY include(qslog/QsLogSharedLibrary.pro) +unset(VERSION) +unset(DESTDIR) +unset(MOC_DIR) +unset(OBJECTS_DIR) TARGET=trikQsLog +VERSION= #do not add a version major number to a name of dll CONFIG += skip_target_version_ext include(../../global.pri)