Use common QsLog by default

Author: MinyazevR

.github/workflows/common_build.yml

@@ -73,7 +73,7 @@ jobs:
       os: macos-14
       build: true
       build_installer: true
-      qmake_extra: "CONFIG+=use_same_qslog CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
+      qmake_extra: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
       trik_python3_version_minor: 11
       tests: true
     secrets: inherit
@@ -160,7 +160,7 @@ jobs:
       build: true
       build_installer: true
       tests: true
-      qmake_extra: "CONFIG+=use_same_qslog CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
+      qmake_extra: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
       gcc_version: 13
       trik_qt_version: 5.15
       trik_python3_version_minor: 11

.github/workflows/windows_build_with_installer.yml

@@ -133,7 +133,7 @@ jobs:
         timeout-minutes: 1
         run: |
             cd ${{ env.BUILD_DIR }}
-            qmake $GITHUB_WORKSPACE/studio.pro -spec win32-g++ CONFIG+=use_same_qslog CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=tests CONFIG+=noPch PYTHON_PATH="${pythonLocation}" PYTHON_VERSION=${{matrix.python-version}}
+            qmake $GITHUB_WORKSPACE/studio.pro -spec win32-g++ CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=tests CONFIG+=noPch PYTHON_PATH="${pythonLocation}" PYTHON_VERSION=${{matrix.python-version}}
 
       - name: QMake all
         timeout-minutes: 5

plugins/robots/thirdparty/trikRuntime/trikRuntime

@@ -19,7 +19,6 @@ CONFIG += trik_not_brick
 cache(CONFIG, set)
 
 SUBDIRS += \
-	trikRuntimeQsLog \
 	trikKernel \
 	trikNetwork \
 	trikControl \
@@ -29,6 +28,17 @@ SUBDIRS += \
 	mlx90640-library \
 #	translations \
 
+EXTERNAL_SETTINGS = $$PWD/trikRuntimeExternal.pri
+cache(EXTERNAL_SETTINGS, set stash super)
+
+trikRuntime_use_local_qslog {
+    SUBDIRS += trikRuntimeQsLog
+    trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
+    EXTERNAL_SETTINGS =
+    cache(EXTERNAL_SETTINGS, set stash super)
+    trikKernel.depends = trikRuntimeQsLog
+}
+
 tests {
 	SUBDIRS *= tests
 	tests.depends = trikScriptRunner trikCommunicator trikKernel
@@ -50,19 +60,6 @@ trikHal.subdir = $$PWD/trikRuntime/trikHal
 mlx90640-library.subdir = $$PWD/trikRuntime/mlx90640-library
 
 trikControl.depends = trikKernel trikHal mlx90640-library
-
-CONFIG(use_same_qslog) {
-    SUBDIRS -= trikRuntimeQsLog
-    EXTERNAL_SETTINGS = $$PWD/trikRuntimeExternal.pri
-    cache(EXTERNAL_SETTINGS, set stash super)
-} else {
-    trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
-    EXTERNAL_SETTINGS =
-    cache(EXTERNAL_SETTINGS, set stash super)
-    trikKernel.depends = trikRuntimeQsLog
-    tests.depends += trikRuntimeQsLog
-}
-
 trikNetwork.depends = trikKernel
 trikScriptRunner.depends += trikControl trikKernel trikNetwork
 trikHal.depends = trikKernel