Skip to content

Commit 73285ad

Browse files
committed
pin branches for submodules, pin QsLog to our fork
1 parent fd7e8c9 commit 73285ad

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

.gitmodules

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
11
[submodule "plugins/robots/thirdparty/trikRuntime"]
22
path = plugins/robots/thirdparty/trikRuntime/trikRuntime
33
url = https://github.com/trikset/trikRuntime
4+
branch = master
45
[submodule "qrtest/thirdparty/googletest/googletest"]
56
path = qrtest/thirdparty/googletest/googletest
67
url = https://github.com/google/googletest
8+
branch = main
79
[submodule "qrgui/thirdparty/qt-solutions"]
810
path = qrgui/thirdparty/qt-solutions
911
url = https://github.com/trikset/qt-solutions
12+
branch = master
1013
[submodule "thirdparty/gamepad/gamepad"]
1114
path = thirdparty/gamepad/gamepad
1215
url = https://github.com/trikset/trik-desktop-gamepad
16+
branch = master
1317
[submodule "plugins/robots/thirdparty/hidapi"]
1418
path = plugins/robots/thirdparty/hidapi
1519
url = https://github.com/libusb/hidapi
1620
[submodule "thirdparty/quazip/quazip"]
1721
path = thirdparty/quazip/quazip
1822
url = https://github.com/stachenov/quazip.git
23+
branch = master
1924
[submodule "plugins/robots/thirdparty/Box2D/Box2D"]
2025
path = plugins/robots/thirdparty/Box2D/Box2D
2126
url = https://github.com/iakov/Box2D
2227
branch = "trik-studio"
2328
[submodule "thirdparty/qslog/qslog"]
2429
path = thirdparty/qslog/qslog
25-
url = https://bitbucket.org/codeimproved/qslog.git
30+
url = https://github.com/trikset/trik-qslog.git
31+
branch = codeimproved-master
2632
[submodule "installer/nxt-tools"]
2733
path = installer/nxt-tools
2834
url = https://github.com/trikset/nxt-tools.git
29-
branch = main
35+
branch = master
3036
[submodule "trik-checkapp"]
3137
path = thirdparty/checkapp/checkapp
3238
url = https://github.com/trikset/trik-checkapp
39+
branch = master

qrtest/thirdparty/googletest/googletest.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ TEMPLATE = lib
1818

1919
include(../../../global.pri)
2020
LIBS -= -ltrikQsLog
21+
CONFIG += c++17
2122

2223
# CONFIG += warn_off
2324

thirdparty/qslog/QsLogSharedLibrary.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
DEFINES += QSLOG_IS_SHARED_LIBRARY
33

44
include(qslog/QsLogSharedLibrary.pro)
5+
unset(VERSION)
6+
unset(DESTDIR)
7+
unset(MOC_DIR)
8+
unset(OBJECTS_DIR)
59

610
TARGET=trikQsLog
11+
VERSION=
712
#do not add a version major number to a name of dll
813
CONFIG += skip_target_version_ext
914
include(../../global.pri)

0 commit comments

Comments
 (0)