From 5d5fe8395db6c7fb7b98dd8a1d4e544a37ad4f13 Mon Sep 17 00:00:00 2001 From: topilski Date: Sun, 31 Mar 2019 12:00:39 -0400 Subject: [PATCH] Review Settings --- CHANGELOG | 3 +++ CMakeLists.txt | 4 ++-- FASTOREDIS_CHANGELOG | 5 ++++- build/fastoredis.txt | 2 +- src/gui/db/leveldb/connection_widget.h | 2 +- src/gui/db/memcached/connection_widget.h | 2 +- src/gui/db/ssdb/connection_widget.h | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8b281c045..717d09c7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2.2.1 / +[Alexandr Topilski] + 2.2.0 / March 31, 2019 [Alexandr Topilski] - Integrate KeyDB api database diff --git a/CMakeLists.txt b/CMakeLists.txt index 59b269693..69217e9e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.6.3) # OPENSSL_USE_STATIC_LIBS ###################### Branding ########################## SET(BRANDING_PROJECT_NAME "FastoNoSQL" CACHE STRING "Branding for ${BRANDING_PROJECT_NAME}") #default -SET(BRANDING_PROJECT_VERSION "2.2.0.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default -SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "release" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default +SET(BRANDING_PROJECT_VERSION "2.2.1.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default +SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "alfa" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default # possible variables: alfa, beta, rc, release SET(BRANDING_PROJECT_TYPE_VERSION "community" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default # possible variables: community, pro, enterprise diff --git a/FASTOREDIS_CHANGELOG b/FASTOREDIS_CHANGELOG index c4cc180ff..c32160762 100644 --- a/FASTOREDIS_CHANGELOG +++ b/FASTOREDIS_CHANGELOG @@ -1,4 +1,7 @@ -2.2.0 / March 31, 2019 +2.1.3 / +[Alexandr Topilski] + +2.1.2 / March 31, 2019 [Alexandr Topilski] - Update core lib diff --git a/build/fastoredis.txt b/build/fastoredis.txt index 34436b334..ac6ed4e38 100644 --- a/build/fastoredis.txt +++ b/build/fastoredis.txt @@ -11,7 +11,7 @@ -DBUILD_WITH_KEYDB=OFF -DBRANDING_PROJECT_BUILD_TYPE_VERSION:STRING=release -DBRANDING_PROJECT_NAME:STRING=FastoRedis --DBRANDING_PROJECT_VERSION:STRING=2.1.2.0 +-DBRANDING_PROJECT_VERSION:STRING=2.1.3.0 -DBRANDING_PROJECT_DOMAIN:STRING=https://fastoredis.com -DBRANDING_PROJECT_DOWNLOAD_LINK:STRING=https://fastoredis.com/anonim_users_downloads -DBRANDING_PROJECT_DOWNLOAD_LINK_PRO:STRING=https://fastoredis.com/pro_users_downloads diff --git a/src/gui/db/leveldb/connection_widget.h b/src/gui/db/leveldb/connection_widget.h index 0cfe2041b..13cd3a3d1 100644 --- a/src/gui/db/leveldb/connection_widget.h +++ b/src/gui/db/leveldb/connection_widget.h @@ -28,7 +28,7 @@ class ConnectionWidget : public ConnectionLocalWidgetDirectoryPath { Q_OBJECT public: - typedef ConnectionBaseWidget base_class; + typedef ConnectionLocalWidgetDirectoryPath base_class; template friend T* gui::createWidget(Args&&... args); diff --git a/src/gui/db/memcached/connection_widget.h b/src/gui/db/memcached/connection_widget.h index 312d813f5..102cdf9ad 100644 --- a/src/gui/db/memcached/connection_widget.h +++ b/src/gui/db/memcached/connection_widget.h @@ -29,7 +29,7 @@ class ConnectionWidget : public ConnectionRemoteWidget { Q_OBJECT public: - typedef ConnectionBaseWidget base_class; + typedef ConnectionRemoteWidget base_class; template friend T* gui::createWidget(Args&&... args); diff --git a/src/gui/db/ssdb/connection_widget.h b/src/gui/db/ssdb/connection_widget.h index 0ee1cea62..17e858f40 100644 --- a/src/gui/db/ssdb/connection_widget.h +++ b/src/gui/db/ssdb/connection_widget.h @@ -30,7 +30,7 @@ class ConnectionWidget : public ConnectionRemoteWidget { Q_OBJECT public: - typedef ConnectionBaseWidget base_class; + typedef ConnectionRemoteWidget base_class; template friend T* gui::createWidget(Args&&... args);