Merge pull request #164 from lxqt/prerelease

Pre-release changes
lxqt · Apr 23, 2020 · d3cb858 · d3cb858
2 parents 7aec378 + 32ed00e
commit d3cb858
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+lxqt-globalkeys-0.15.0 / 2020-04-22
+===================================
+  * Removed (duplicated) string casts definitions.
+  * Removed obsolete `qBinaryFind`.
+  * Added some translation context to `main_window.ui`.
+  * Don't mix const and non-const iterators.
+
 lxqt-globalkeys-0.14.3 / 2019-10-14
 ===================================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,8 +12,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
 
 set(KF5_MINIMUM_VERSION "5.36.0")
-set(LXQT_MINIMUM_VERSION "0.14.1")
-set(QT_MINIMUM_VERSION "5.7.1")
+set(LXQT_MINIMUM_VERSION "0.15.0")
+set(QT_MINIMUM_VERSION "5.10.0")
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -28,8 +28,8 @@ find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED)
 
 # Version
 set(LXQT_GLOBALKEYS_MAJOR_VERSION 0)
-set(LXQT_GLOBALKEYS_MINOR_VERSION 14)
-set(LXQT_GLOBALKEYS_PATCH_VERSION 3)
+set(LXQT_GLOBALKEYS_MINOR_VERSION 15)
+set(LXQT_GLOBALKEYS_PATCH_VERSION 0)
 set(LXQT_GLOBALKEYS_VERSION ${LXQT_GLOBALKEYS_MAJOR_VERSION}.${LXQT_GLOBALKEYS_MINOR_VERSION}.${LXQT_GLOBALKEYS_PATCH_VERSION})
 add_definitions("-DLXQT_GLOBALKEYS_VERSION=\"${LXQT_GLOBALKEYS_VERSION}\"")