Merge pull request #767 from QuasarApp/task_712

Fix windows wrapper script
QuasarApp · Aug 16, 2023 · 001cf34 · 001cf34
2 parents c6b01c4 + b7a6826
commit 001cf34
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Deploy/src/ScriptsTemplates/windows.bat b/src/Deploy/src/ScriptsTemplates/windows.bat
@@ -14,7 +14,7 @@
 
 @echo off
 SET BASE_DIR=%~dp0
-SET PATH=%BASE_DIR%CQT_BIN_PATH;%BASE_DIR%CQT_LIB_PATH;%PATH%;CQT_SYSTEM_LIB_PATH
+SET PATH=%BASE_DIR%CQT_BIN_PATH;%BASE_DIR%CQT_LIB_PATH;%PATH%;%BASE_DIR%CQT_SYSTEM_LIB_PATH
 SET CQT_PKG_ROOT=%BASE_DIR%
 SET CQT_RUN_FILE=%BASE_DIR%CQT_BASE_NAME.bat
 

diff --git a/src/Deploy/src/deploy.cpp b/src/Deploy/src/deploy.cpp
@@ -25,7 +25,8 @@ Deploy::Deploy() {
 
 int Deploy::run() {
 
-    QuasarAppUtils::Settings::initService<QuasarAppUtils::Settings>();
+
+    QuasarAppUtils::Settings::initService();
 
     if (!prepare()) {
         return PrepareError;

diff --git a/submodules/QuasarAppLib b/submodules/QuasarAppLib
+1 −1		CMake
+1 −1		CMakeLists.txt
+8 −0		isettings.cpp
+19 −1		isettings.h
+7 −9		locales.cpp
+1 −1		locales.h
+1 −1		qaglobalutils.cpp
+37 −20		qaservice.h
+4 −0		settings.cpp
+7 −0		settings.h