From 6913efdf9d28b3c0dff8985b540d3aa4cbd632cb Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:34:44 +0300 Subject: [PATCH 1/5] pip,qad,readme --- README.md | 8 ++++---- pip | 2 +- qad | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cbe91b8..15babe7 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ This repo can be compiled with GCC/MinGW/Clang, for Qt 4/5. If there is no Qt found, builds only PIP and CD. CMake options: -* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ${ANDROID_SYSTEM_LIBRARY_PATH} on Android. If 1 then install to ${CMAKE_INSTALL_PREFIX}. Disabled by default +* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ANDROID_SYSTEM_LIBRARY_PATH on Android. If 1 then install to CMAKE_INSTALL_PREFIX. Disabled by default * **UTILS** - build or not executable utilites, enabled by default * **DESIGNER_PLUGINS** - build or not Qt Designer plugins, enabled by default * **QGLVIEW** - build or not QGLView, disabled by default @@ -71,11 +71,11 @@ Build steps: 3. Download and install cmake from https://cmake.org/download/ 4. Prepare environment for x86 or amd64 architecture: - set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\ - set SDK_MINGW_DIR=C:\mingw\8_1_x + set `SDK_MINGW_DIR=C:\mingw\8_1_x` - set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\ - set SDK_QT5_DIR=C:\qt\qt5150_win + set `K_QT5_DIR=C:\qt\qt5150_win` - set path to cmake directory - set SDK_CMAKE_DIR=C:\cmake or C:\Program Files\CMake + set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake` 5. Run `make_shstk32.bat` or `make_shstk64.bat` Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat` diff --git a/pip b/pip index 0ae63fa..dd56b1c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 0ae63fa9ad1e9a0d876307da11c0375cab8be153 +Subproject commit dd56b1c142c87488c49107f4eb3586ba735a180e diff --git a/qad b/qad index 7ce2b31..024360d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 7ce2b31ec9b78a39d84de1276e6bd0efc9d0e647 +Subproject commit 024360dec5dd99061b6d1b30a40b461b73459e33 -- 2.43.0 From ae7eb04e1e31c47cddd3c4de4262e850cf50f199 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:35:35 +0300 Subject: [PATCH 2/5] README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15babe7..69ccf6f 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Build steps: - set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\ set `SDK_MINGW_DIR=C:\mingw\8_1_x` - set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\ - set `K_QT5_DIR=C:\qt\qt5150_win` + set `SDK_QT5_DIR=C:\qt\qt5150_win` - set path to cmake directory set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake` 5. Run `make_shstk32.bat` or `make_shstk64.bat` -- 2.43.0 From a9f01a4c20e63df989f1e24d9026b519393360dd Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 15 Jun 2023 12:38:17 +0300 Subject: [PATCH 3/5] README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 69ccf6f..31fa360 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ After successfully install, you can use next CMake imported targets: * QAD::Application * QAD::Blockview * QAD::Graphic - widget for realtime visualization and publication quality 1D/2D plots + * QAD::SQL - wrapper around QtSqlQuery for code amount reduce * QAD::SQLTable - widget for display and edit data based on SQL tables with relations * QAD::TouchWidgets - collection of widgets for touch screen interface * QAD::Doc - markdown helper for qt -- 2.43.0 From 9c34ee2b7e4868da78767a6f34fdd7b3b6c84c4b Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 2 Jul 2023 14:03:53 +0300 Subject: [PATCH 4/5] pip --- .gitignore | 1 + pip | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b2ef11..48a9424 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ CMakeLists.txt.user* /release /build +/*_build_* diff --git a/pip b/pip index dd56b1c..ccae1a7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit dd56b1c142c87488c49107f4eb3586ba735a180e +Subproject commit ccae1a73111f54450c937a1eb2e3cdaba4880241 -- 2.43.0 From a477ed4d0c18b87f6425aa1405b3a618d6b903f5 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 2 Jul 2023 14:10:31 +0300 Subject: [PATCH 5/5] qglengine --- qglengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qglengine b/qglengine index dfc4c71..9c78ba5 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit dfc4c718e8870d4630ac534781f9d7105a00846f +Subproject commit 9c78ba52816b854f1e4999248bc664aba9ccc523 -- 2.43.0