From c3ff227dca74366f9bfe3b7c65d52bf74f321814 Mon Sep 17 00:00:00 2001 From: seleznevae Date: Sun, 8 Oct 2017 22:30:54 +0300 Subject: [PATCH] Commit --- deploy/README | 7 ------- deploy/tt.xml | 7 ------- src/JaG.pro | 11 +---------- src/basic/global_definitions.h | 4 ++-- src/commonWidgets/aboutjag.cpp | 2 +- 5 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 deploy/README delete mode 100644 deploy/tt.xml diff --git a/deploy/README b/deploy/README deleted file mode 100644 index 4f3a6e0..0000000 --- a/deploy/README +++ /dev/null @@ -1,7 +0,0 @@ - -tt.xml -> /usr/share/mime/packages/tt.xml (?? /usr/share/mime/application/tt.xml ) -# update-mime-database /usr/share/mime - - -JaG.desktop -> /usr/share/applications -# update-desktop-database diff --git a/deploy/tt.xml b/deploy/tt.xml deleted file mode 100644 index 6e66622..0000000 --- a/deploy/tt.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - tt file - - - diff --git a/src/JaG.pro b/src/JaG.pro index f33a30e..9128dc0 100644 --- a/src/JaG.pro +++ b/src/JaG.pro @@ -12,16 +12,7 @@ CONFIG += c++14 LIBS += -lm -ldl -lboost_system -lboost_filesystem -#CONFIG(release,debug|release){ -# LIBS += -lQSCore -# LIBS += -lQSCharts -#} -#CONFIG(debug,debug|release){ -# LIBS += -lQSCored -# LIBS += -lQSChartsd -# #QMAKE_LFLAGS += -fsanitize=address -# # QMAKE_CXXFLAGS += -fsanitize=address -#} + include(./commonWidgets/widgettilemanager/widgettilemanager.pri) include(./commonWidgets/qsint/qsint.pri) diff --git a/src/basic/global_definitions.h b/src/basic/global_definitions.h index 37811f7..302a8ab 100644 --- a/src/basic/global_definitions.h +++ b/src/basic/global_definitions.h @@ -5,8 +5,8 @@ //#define CURRENT_VERSION "0.2" #define JAG_MAJOR_NUMBER 0 -#define JAG_MINOR_NUMBER 4 -#define JAG_RELEASE_NUMBER 3 +#define JAG_MINOR_NUMBER 1 +#define JAG_RELEASE_NUMBER 0 #define JAG_BUILD_NUMBER 0 diff --git a/src/commonWidgets/aboutjag.cpp b/src/commonWidgets/aboutjag.cpp index 3c4c522..256d111 100644 --- a/src/commonWidgets/aboutjag.cpp +++ b/src/commonWidgets/aboutjag.cpp @@ -17,7 +17,7 @@ AboutJag::AboutJag(QWidget *parent) : "Based on Qt " + QT_VERSION_STR + " (GCC " + __VERSION__ + ")
" " Compiled on " + __DATE__ + "
" - "Copyright(c) 2016
" + "Copyright(c) 2016 - 2017
" "Seleznev Anton
" "seleznevae@protonmail.com" );