diff --git a/.gitignore b/.gitignore index ee7aa1b..28aeb3e 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,6 @@ _deps # Configured files build.gradle AndroidManifest.xml -src/Example/Deploy/RENAME_ME.json -src/Library/src/public/RENAME_ME/global.h +src/qTbot/src/public/qTbot/global.h +src/example/deploy/qTbot.json doxygen.conf diff --git a/CMakeLists.txt b/CMakeLists.txt index c19beb4..1915f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,4 +58,3 @@ endif() configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) -addDeployFromCustomFile("qTbot" "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json") diff --git a/README.md b/README.md index c130140..d3e1147 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ At this time This library supports next platforms: ## Using -``` cpp +```cpp #include #include diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt index 1bba14a..e4727a6 100644 --- a/src/example/CMakeLists.txt +++ b/src/example/CMakeLists.txt @@ -98,8 +98,8 @@ else() message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT}) - set(DeployFile ) configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json" @ONLY) + addDeployFromCustomFile(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json") endif() diff --git a/src/example/deploy/qTbot.json b/src/example/deploy/qTbot.json deleted file mode 100644 index a178b91..0000000 --- a/src/example/deploy/qTbot.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "bin": [ - "src/build/Debug/qTbotEaxample", - "src/build/Debug/qTbotEaxample.exe" - ], - "clear": true, - "binPrefix": "/home/andrei/git/build-qTbot-Desktop_Qt_6_5_2_GCC_64bit-Debug", - "libDir": [ - "/home/andrei/git/qTbot", - "/home/andrei/Qt/6.5.2/gcc_64", - "/home/andrei/git/build-qTbot-Desktop_Qt_6_5_2_GCC_64bit-Debug" - ], - "recursiveDepth": "10", - "deploySystem": false, - "qmlDir": "../", - "deb": true, - "qif": true, - "zip": true, - "ignoreEnv": [ - "/home/andrei/git/qTbot/Distro" - ], - "extraLib": "crypto", - "targetDir": "/home/andrei/git/qTbot/Distro", - "deployVersion": "0.28.fa99f10", - -} - diff --git a/src/qTbot/src/public/qTbot/global.h b/src/qTbot/src/public/qTbot/global.h deleted file mode 100644 index 744f199..0000000 --- a/src/qTbot/src/public/qTbot/global.h +++ /dev/null @@ -1,22 +0,0 @@ -//# -//# Copyright (C) 2023-2023 QuasarApp. -//# Distributed under the GPLv3 software license, see the accompanying -//# Everyone is permitted to copy and distribute verbatim copies -//# of this license document, but changing it is not allowed. -//# - -#ifndef qTbot_GLOBAL_H -#define qTbot_GLOBAL_H - -#include - -#define QTBOT_VERSION "0.30.efa3b97" - -#if defined(QTBOT_LIBRARY) -# define QTBOT_EXPORT Q_DECL_EXPORT -#else -# define QTBOT_EXPORT Q_DECL_IMPORT -#endif - -#endif //qTbot_GLOBAL_H -