From 70fd6f077065094aa775b73e407432ee87e9f05a Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 3 May 2023 15:07:39 -0400 Subject: [PATCH] Prep for release 1.7.0 --- CMakeLists.txt | 4 ++-- Changelog | 2 +- conan/conanfile.py | 2 +- distro/debian.changelog | 6 ++++++ distro/qt5-kddockwidgets.dsc | 4 ++-- distro/qt5-kddockwidgets.spec | 4 +++- distro/qt6-kddockwidgets.dsc | 4 ++-- distro/qt6-kddockwidgets.spec | 4 +++- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fba6d9ce0..b049e7f53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,8 +88,8 @@ project( ) set(${PROJECT_NAME}_VERSION_MAJOR 1) -set(${PROJECT_NAME}_VERSION_MINOR 6) -set(${PROJECT_NAME}_VERSION_PATCH 95) +set(${PROJECT_NAME}_VERSION_MINOR 7) +set(${PROJECT_NAME}_VERSION_PATCH 0) set(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH} ) diff --git a/Changelog b/Changelog index a66255208..057ee152f 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -* v1.7.0 (unreleased) +* v1.7.0 (03 May 2023) - Introduce DockWidget::setFloatingWindowFlags(flags). Allows for different FloatingWindows to have different window flags. For example, some having Qt::Tool while others having Qt::Window (#314). diff --git a/conan/conanfile.py b/conan/conanfile.py index 0514bcd93..f6213ba7a 100644 --- a/conan/conanfile.py +++ b/conan/conanfile.py @@ -12,7 +12,7 @@ class KDDockWidgetsConan(ConanFile): name = "kddockwidgets" - version = "1.6.95" + version = "1.7.0" default_user = "kdab" default_channel = "stable" license = ("https://raw.githubusercontent.com/KDAB/KDDockWidgets/master/LICENSES/GPL-2.0-only.txt", diff --git a/distro/debian.changelog b/distro/debian.changelog index 9801811f2..5b76ddb58 100644 --- a/distro/debian.changelog +++ b/distro/debian.changelog @@ -1,3 +1,9 @@ +kddockwidgets (1.7.0) release candidate; urgency=high + + * 1.7.0 final + + -- Allen Winter Wed, 03 May 2023 15:00:00 -0500 + kddockwidgets (1.6.0) release candidate; urgency=high * 1.6.0 final diff --git a/distro/qt5-kddockwidgets.dsc b/distro/qt5-kddockwidgets.dsc index ba9aee8db..4a1816f50 100644 --- a/distro/qt5-kddockwidgets.dsc +++ b/distro/qt5-kddockwidgets.dsc @@ -1,10 +1,10 @@ Format: 1.0 Source: kddockwidgets -Version: 1.6.0-1 +Version: 1.7.0-1 Binary: kddockwidgets Maintainer: Allen Winter Architecture: any Build-Depends: debhelper (>=9), cdbs, cmake, qtbase5-dev, qtbase5-private-dev, libqt5x11extras5-dev, libfontconfig-dev, libfreetype-dev Files: - 00000000000000000000000000000000 00000 qt5-kddockwidgets-1.6.0.tar.gz + 00000000000000000000000000000000 00000 qt5-kddockwidgets-1.7.0.tar.gz diff --git a/distro/qt5-kddockwidgets.spec b/distro/qt5-kddockwidgets.spec index 278be5f26..72727628a 100644 --- a/distro/qt5-kddockwidgets.spec +++ b/distro/qt5-kddockwidgets.spec @@ -1,5 +1,5 @@ Name: qt5-kddockwidgets -Version: 1.6.0 +Version: 1.7.0 Release: 1 Summary: KDAB's Dock Widget Framework for Qt5 Source0: %{name}-%{version}.tar.gz @@ -98,6 +98,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release %{_libdir}/libkddockwidgets.so %changelog +* Wed May 03 2023 Allen Winter 1.7.0 + 1.7.0 final * Wed Sep 14 2022 Allen Winter 1.6.0 1.6.0 final * Mon Nov 24 2021 Allen Winter 1.5.0 diff --git a/distro/qt6-kddockwidgets.dsc b/distro/qt6-kddockwidgets.dsc index 0511db8c0..6d6dab928 100644 --- a/distro/qt6-kddockwidgets.dsc +++ b/distro/qt6-kddockwidgets.dsc @@ -1,10 +1,10 @@ Format: 1.0 Source: kddockwidgets -Version: 1.6.0-1 +Version: 1.7.0-1 Binary: kddockwidgets Maintainer: Allen Winter Architecture: any Build-Depends: debhelper (>=9), cdbs, cmake, qt6-base-dev, qt6-base-private-dev, libgl1-mesa-dev, libfontconfig-dev, libfreetype-dev Files: - 00000000000000000000000000000000 00000 qt6-kddockwidgets-1.6.0.tar.gz + 00000000000000000000000000000000 00000 qt6-kddockwidgets-1.7.0.tar.gz diff --git a/distro/qt6-kddockwidgets.spec b/distro/qt6-kddockwidgets.spec index 70b044c65..179aa6679 100644 --- a/distro/qt6-kddockwidgets.spec +++ b/distro/qt6-kddockwidgets.spec @@ -1,5 +1,5 @@ Name: qt6-kddockwidgets -Version: 1.6.0 +Version: 1.7.0 Release: 1 Summary: KDAB's Dock Widget Framework for Qt6 Source0: %{name}-%{version}.tar.gz @@ -92,6 +92,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKDDockWidgets_QT6=True -DCMAKE_BUILD_TYPE= %{_libdir}/libkddockwidgets-qt6.so %changelog +* Wed May 03 2023 Allen Winter 1.7.0 + 1.7.0 final * Wed Sep 14 2022 Allen Winter 1.6.0 1.6.0 final * Mon Nov 24 2021 Allen Winter 1.5.0