version bump [ci reset]

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d12a7fa..df2258a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,9 +92,9 @@ endif()
 
 # mostly relevant to the build process, also stored in the version file for CMake and in qconfig.h.cmake
 set(KATIE_MAJOR "4")
-set(KATIE_MINOR "11")
-set(KATIE_MICRO "1")
-set(KATIE_HEX "0x041101")
+set(KATIE_MINOR "12")
+set(KATIE_MICRO "0")
+set(KATIE_HEX "0x041200")
 set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
 
 # only for the build process

diff --git a/appveyor.yml b/appveyor.yml
index e3e3fb7..3f892c9 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.11.1-{branch}-{build}
+version: 4.12.0-{branch}-{build}
 image: Ubuntu2004
 clone_depth: 1
 cache:

diff --git a/doxygen.conf b/doxygen.conf
index 84c57f8..28feec7 100644 (file)
--- a/doxygen.conf
+++ b/doxygen.conf
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Katie"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.11.1
+PROJECT_NUMBER         = 4.12.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
index 5f83f54..22eee55 100644 (file)
--- a/package/archlinux/PKGBUILD
+++ b/package/archlinux/PKGBUILD
@@ -4,7 +4,7 @@
 # https://wiki.archlinux.org/index.php/Arch_package_guidelines
 
 pkgname=katie-git
-pkgver=4.11.1.r4681.8f22ea5f
+pkgver=4.12.0.r4681.8f22ea5f
 pkgrel=1
 pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
 arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm')
@@ -20,7 +20,7 @@ conflicts=('katie')
 
 pkgver() {
     cd katie
-    printf "4.11.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    printf "4.12.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {

diff --git a/package/debian/changelog b/package/debian/changelog
index 01df07f..5ef3572 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,15 +1,21 @@
-katie (4.11.1) unstable; urgency=medium
+katie (4.12.0) unstable; urgency=medium
+
+  * Seventh package update
+
+ -- Ivailo Monev <xakepa10@gmail.com>  Tue, 14 Dec 2021 09:36:46 +0200
+
+katie (4.11.1) stable; urgency=medium
 
   * Sixed package update
 
  -- Ivailo Monev <xakepa10@gmail.com>  Tue, 23 Nov 2021 12:49:58 +0200
- 
+
 katie (4.11.0) stable; urgency=medium
 
   * Fifth package update
 
  -- Ivailo Monev <xakepa10@gmail.com>  Fri, 13 Aug 2021 07:32:58 +0200
- 
+
 katie (4.10.0) stable; urgency=medium
 
   * Fourth package update

diff --git a/package/debian/control b/package/debian/control
index 910c6dd..bc264c3 100644 (file)
--- a/package/debian/control
+++ b/package/debian/control
@@ -4,7 +4,7 @@ Maintainer: Ivailo Monev <xakepa10@gmail.com>
 Homepage: https://github.com/fluxer/katie
 Vcs-Git: git://github.com/fluxer/katie.git
 Vcs-browser: https://github.com/fluxer/katie
-Standards-Version: 4.11.1
+Standards-Version: 4.12.0
 Build-Depends: debhelper (>= 9~), libssl-dev, zlib1g-dev, libzstd-dev,
  libc6-dev, libjansson-dev, libpng-dev, libjpeg-dev, libtiff5-dev,
  libcups2-dev, libfreetype6-dev, libfontconfig1-dev, libpcre3-dev,

diff --git a/package/fedora/katie.spec b/package/fedora/katie.spec
index a14ac5b..a91b85b 100644 (file)
--- a/package/fedora/katie.spec
+++ b/package/fedora/katie.spec
@@ -1,7 +1,7 @@
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/
 
 Name: katie
-Version: 4.11.1
+Version: 4.12.0
 Release: 1%{?dist}
 Summary: C++ toolkit derived from the Qt 4.8 framework
 License: BSD and LGPLv2+
@@ -66,6 +66,9 @@ This package includes headers, pkg-config and CMake files.
 %{_libdir}/cmake/Katie/*
 
 %changelog
+* Tue Dec 14 2021 Ivailo Monev <xakepa10@gmail.com> - 4.12.0-1
+- package update
+
 * Tue Nov 23 2021 Ivailo Monev <xakepa10@gmail.com> - 4.11.1-1
 - package update
 

diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 5c057a3..84d48aa 100644 (file)
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -1,7 +1,7 @@
 # https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/
 
 PORTNAME = katie
-DISTVERSION = 4.11.1.d20201231
+DISTVERSION = 4.12.0.d20201231
 CATEGORIES = devel x11 ftp net www
 MAINTAINER = xakepa10@gmail.com
 COMMENT = C++ toolkit derived from the Qt 4.8 framework

diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist
index d400cf4..57647ca 100644 (file)
--- a/package/freebsd/pkg-plist
+++ b/package/freebsd/pkg-plist
@@ -1413,44 +1413,44 @@ lib/katie/plugins/imageformats/libqtga.so
 lib/katie/plugins/imageformats/libqtiff.so
 lib/katie/plugins/script/libqtscriptdbus.so
 lib/libKtCore.so
-lib/libKtCore.so.4.11
-lib/libKtCore.so.4.11.1
+lib/libKtCore.so.4.12
+lib/libKtCore.so.4.12.0
 lib/libKtDBus.so
-lib/libKtDBus.so.4.11
-lib/libKtDBus.so.4.11.1
+lib/libKtDBus.so.4.12
+lib/libKtDBus.so.4.12.0
 lib/libKtDeclarative.so
-lib/libKtDeclarative.so.4.11
-lib/libKtDeclarative.so.4.11.1
+lib/libKtDeclarative.so.4.12
+lib/libKtDeclarative.so.4.12.0
 lib/libKtDesigner.so
-lib/libKtDesigner.so.4.11
-lib/libKtDesigner.so.4.11.1
+lib/libKtDesigner.so.4.12
+lib/libKtDesigner.so.4.12.0
 lib/libKtDesignerComponents.so
-lib/libKtDesignerComponents.so.4.11
-lib/libKtDesignerComponents.so.4.11.1
+lib/libKtDesignerComponents.so.4.12
+lib/libKtDesignerComponents.so.4.12.0
 lib/libKtGui.so
-lib/libKtGui.so.4.11
-lib/libKtGui.so.4.11.1
+lib/libKtGui.so.4.12
+lib/libKtGui.so.4.12.0
 lib/libKtNetwork.so
-lib/libKtNetwork.so.4.11
-lib/libKtNetwork.so.4.11.1
+lib/libKtNetwork.so.4.12
+lib/libKtNetwork.so.4.12.0
 lib/libKtScript.so
-lib/libKtScript.so.4.11
-lib/libKtScript.so.4.11.1
+lib/libKtScript.so.4.12
+lib/libKtScript.so.4.12.0
 lib/libKtScriptTools.so
-lib/libKtScriptTools.so.4.11
-lib/libKtScriptTools.so.4.11.1
+lib/libKtScriptTools.so.4.12
+lib/libKtScriptTools.so.4.12.0
 lib/libKtSvg.so
-lib/libKtSvg.so.4.11
-lib/libKtSvg.so.4.11.1
+lib/libKtSvg.so.4.12
+lib/libKtSvg.so.4.12.0
 lib/libKtTest.so
-lib/libKtTest.so.4.11
-lib/libKtTest.so.4.11.1
+lib/libKtTest.so.4.12
+lib/libKtTest.so.4.12.0
 lib/libKtUiTools.so
-lib/libKtUiTools.so.4.11
-lib/libKtUiTools.so.4.11.1
+lib/libKtUiTools.so.4.12
+lib/libKtUiTools.so.4.12.0
 lib/libKtXml.so
-lib/libKtXml.so.4.11
-lib/libKtXml.so.4.11.1
+lib/libKtXml.so.4.12
+lib/libKtXml.so.4.12.0
 libdata/pkgconfig/KtCore.pc
 libdata/pkgconfig/KtDBus.pc
 libdata/pkgconfig/KtDeclarative.pc

diff --git a/package/netbsd/Makefile b/package/netbsd/Makefile
index 8066d20..6a3278f 100644 (file)
--- a/package/netbsd/Makefile
+++ b/package/netbsd/Makefile
@@ -4,7 +4,7 @@
 # https://www.netbsd.org/docs/pkgsrc/
 
 DISTNAME = master
-PKGNAME = katie-4.11.1.d20201231
+PKGNAME = katie-4.12.0.d20201231
 CATEGORIES = devel x11 net www
 MAINTAINER = xakepa10@gmail.com
 COMMENT = C++ toolkit deived from the Qt 4.8 framework

diff --git a/package/netbsd/PLIST b/package/netbsd/PLIST
index 832e6ab..71f6eb0 100644 (file)
--- a/package/netbsd/PLIST
+++ b/package/netbsd/PLIST
@@ -1416,44 +1416,44 @@ lib/katie/plugins/imageformats/libqtga.so
 lib/katie/plugins/imageformats/libqtiff.so
 lib/katie/plugins/script/libqtscriptdbus.so
 lib/libKtCore.so
-lib/libKtCore.so.4.11
-lib/libKtCore.so.4.11.1
+lib/libKtCore.so.4.12
+lib/libKtCore.so.4.12.0
 lib/libKtDBus.so
-lib/libKtDBus.so.4.11
-lib/libKtDBus.so.4.11.1
+lib/libKtDBus.so.4.12
+lib/libKtDBus.so.4.12.0
 lib/libKtDeclarative.so
-lib/libKtDeclarative.so.4.11
-lib/libKtDeclarative.so.4.11.1
+lib/libKtDeclarative.so.4.12
+lib/libKtDeclarative.so.4.12.0
 lib/libKtDesigner.so
-lib/libKtDesigner.so.4.11
-lib/libKtDesigner.so.4.11.1
+lib/libKtDesigner.so.4.12
+lib/libKtDesigner.so.4.12.0
 lib/libKtDesignerComponents.so
-lib/libKtDesignerComponents.so.4.11
-lib/libKtDesignerComponents.so.4.11.1
+lib/libKtDesignerComponents.so.4.12
+lib/libKtDesignerComponents.so.4.12.0
 lib/libKtGui.so
-lib/libKtGui.so.4.11
-lib/libKtGui.so.4.11.1
+lib/libKtGui.so.4.12
+lib/libKtGui.so.4.12.0
 lib/libKtNetwork.so
-lib/libKtNetwork.so.4.11
-lib/libKtNetwork.so.4.11.1
+lib/libKtNetwork.so.4.12
+lib/libKtNetwork.so.4.12.0
 lib/libKtScript.so
-lib/libKtScript.so.4.11
-lib/libKtScript.so.4.11.1
+lib/libKtScript.so.4.12
+lib/libKtScript.so.4.12.0
 lib/libKtScriptTools.so
-lib/libKtScriptTools.so.4.11
-lib/libKtScriptTools.so.4.11.1
+lib/libKtScriptTools.so.4.12
+lib/libKtScriptTools.so.4.12.0
 lib/libKtSvg.so
-lib/libKtSvg.so.4.11
-lib/libKtSvg.so.4.11.1
+lib/libKtSvg.so.4.12
+lib/libKtSvg.so.4.12.0
 lib/libKtTest.so
-lib/libKtTest.so.4.11
-lib/libKtTest.so.4.11.1
+lib/libKtTest.so.4.12
+lib/libKtTest.so.4.12.0
 lib/libKtUiTools.so
-lib/libKtUiTools.so.4.11
-lib/libKtUiTools.so.4.11.1
+lib/libKtUiTools.so.4.12
+lib/libKtUiTools.so.4.12.0
 lib/libKtXml.so
-lib/libKtXml.so.4.11
-lib/libKtXml.so.4.11.1
+lib/libKtXml.so.4.12
+lib/libKtXml.so.4.12.0
 lib/pkgconfig/KtCore.pc
 lib/pkgconfig/KtDBus.pc
 lib/pkgconfig/KtDeclarative.pc

diff --git a/package/netbsd/buildlink3.mk b/package/netbsd/buildlink3.mk
index fb03b6e..9ba5b6a 100644 (file)
--- a/package/netbsd/buildlink3.mk
+++ b/package/netbsd/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=        katie
 .if !defined(KATIE_BUILDLINK3_MK)
 KATIE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.katie+=  katie>=4.11.1.d20201231
+BUILDLINK_API_DEPENDS.katie+=  katie>=4.12.0.d20201231
 BUILDLINK_PKGSRCDIR.katie?=    ../../devel/katie
 .endif # KATIE_BUILDLINK3_MK
 

diff --git a/package/openbsd/Makefile b/package/openbsd/Makefile
index 2deff80..ac9aa26 100644 (file)
--- a/package/openbsd/Makefile
+++ b/package/openbsd/Makefile
@@ -3,7 +3,7 @@
 # https://www.openbsd.org/faq/ports/
 
 DISTNAME = katie
-PKGNAME = katie-4.11.1.d20201231
+PKGNAME = katie-4.12.1.d20201231
 CATEGORIES = devel x11 net www
 MAINTAINER = Ivailo Monev <xakepa10@gmail.com>
 COMMENT = C++ toolkit derived from the Qt 4.8 framework
@@ -31,18 +31,18 @@ SEPARATE_BUILD = Yes
 CONFIGURE_ARGS = -DKATIE_TOOLS_SUFFIX="-katie" -Wno-dev
 
 SHARED_LIBS = \
-       KtCore                4.11 \
-       KtDBus                4.11 \
-       KtDeclarative         4.11 \
-       KtDesigner            4.11 \
-       KtDesignerComponents  4.11 \
-       KtGui                 4.11 \
-       KtNetwork             4.11 \
-       KtScript              4.11 \
-       KtScriptTools         4.11 \
-       KtSvg                 4.11 \
-       KtTest                4.11 \
-       KtUiTools             4.11 \
-       KtXml                 4.11
+       KtCore                4.12 \
+       KtDBus                4.12 \
+       KtDeclarative         4.12 \
+       KtDesigner            4.12 \
+       KtDesignerComponents  4.12 \
+       KtGui                 4.12 \
+       KtNetwork             4.12 \
+       KtScript              4.12 \
+       KtScriptTools         4.12 \
+       KtSvg                 4.12 \
+       KtTest                4.12 \
+       KtUiTools             4.12 \
+       KtXml                 4.12
 
 .include <bsd.port.mk>

diff --git a/scripts/genman.py b/scripts/genman.py
index f90010a..1bedc08 100755 (executable)
--- a/scripts/genman.py
+++ b/scripts/genman.py
@@ -23,7 +23,7 @@ for root, sdir, lfiles in os.walk('%s/../src/tools' % cwd):
             ofile = ifile.replace('.pod', '.1')
             subprocess.check_call(
                 (pod2man,
-                '--release=Katie 4.11.1',
+                '--release=Katie 4.12.0',
                 '--center=Katie Manual',
                 '--section=1',
                 '--utf8',

diff --git a/scripts/tarball.sh b/scripts/tarball.sh
index f6c385f..643d717 100755 (executable)
--- a/scripts/tarball.sh
+++ b/scripts/tarball.sh
@@ -4,6 +4,6 @@ set -e
 
 cwd="$(readlink -f $(dirname $0))"
 
-tarball="Katie-4.11.1-Source"
+tarball="Katie-4.12.0-Source"
 
 git archive HEAD --format=tar --prefix="$tarball/" | xz > "$cwd/../$tarball.tar.xz"

diff --git a/src/core/io/qdatastream.h b/src/core/io/qdatastream.h
index 6d6f32f..449d1b4 100644 (file)
--- a/src/core/io/qdatastream.h
+++ b/src/core/io/qdatastream.h
@@ -48,11 +48,12 @@ public:
         Qt_4_9 = Qt_4_8,
         Qt_4_10 = Qt_4_9,
         Qt_4_11 = Qt_4_10,
-#if QT_VERSION > 0x041101
+        Qt_4_12 = Qt_4_11,
+#if QT_VERSION > 0x041200
 #error Add the datastream version for this version
-        Qt_4_12 = Qt_4_11
+        Qt_4_13 = Qt_4_12
 #endif
-        Qt_Default = Qt_4_11
+        Qt_Default = Qt_4_12
     };
 
     enum ByteOrder {

diff --git a/src/tools/moc/moc.1 b/src/tools/moc/moc.1
index e5ca709..39b4b6c 100644 (file)
--- a/src/tools/moc/moc.1
+++ b/src/tools/moc/moc.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "MOC 1"
-.TH MOC 1 "2021-09-20" "Katie 4.11.1" "Katie Manual"
+.TH MOC 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qdbus/qdbus.1 b/src/tools/qdbus/qdbus.1
index 0d14d55..be4a5b5 100644 (file)
--- a/src/tools/qdbus/qdbus.1
+++ b/src/tools/qdbus/qdbus.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "QDBUS 1"
-.TH QDBUS 1 "2021-09-20" "Katie 4.11.1" "Katie Manual"
+.TH QDBUS 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qdbus/qdbuscpp2xml.1 b/src/tools/qdbus/qdbuscpp2xml.1
index b547b22..c5c6d59 100644 (file)
--- a/src/tools/qdbus/qdbuscpp2xml.1
+++ b/src/tools/qdbus/qdbuscpp2xml.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "QDBUSCPP2XML 1"
-.TH QDBUSCPP2XML 1 "2021-09-20" "Katie 4.11.1" "Katie Manual"
+.TH QDBUSCPP2XML 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qdbus/qdbusxml2cpp.1 b/src/tools/qdbus/qdbusxml2cpp.1
index ba2e1c8..38db12e 100644 (file)
--- a/src/tools/qdbus/qdbusxml2cpp.1
+++ b/src/tools/qdbus/qdbusxml2cpp.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "QDBUSXML2CPP 1"
-.TH QDBUSXML2CPP 1 "2021-09-20" "Katie 4.11.1" "Katie Manual"
+.TH QDBUSXML2CPP 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qscript/qscript.1 b/src/tools/qscript/qscript.1
index b1de6cf..e6072c5 100644 (file)
--- a/src/tools/qscript/qscript.1
+++ b/src/tools/qscript/qscript.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "QSCRIPT 1"
-.TH QSCRIPT 1 "2021-09-20" "Katie 4.11.1" "Katie Manual"
+.TH QSCRIPT 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/rcc/rcc.1 b/src/tools/rcc/rcc.1
index b015830..b8f28ff 100644 (file)
--- a/src/tools/rcc/rcc.1
+++ b/src/tools/rcc/rcc.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RCC 1"
-.TH RCC 1 "2021-11-22" "Katie 4.11.1" "Katie Manual"
+.TH RCC 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/uic/uic.1 b/src/tools/uic/uic.1
index 3cff98c..ce82155 100644 (file)
--- a/src/tools/uic/uic.1
+++ b/src/tools/uic/uic.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "UIC 1"
-.TH UIC 1 "2021-09-20" "Katie 4.11.1" "Katie Manual"
+.TH UIC 1 "2021-12-08" "Katie 4.12.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index 2aa5003..366b58b 100644 (file)
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -255,11 +255,12 @@ static int NColorRoles[] = {
     QPalette::ToolTipText + 1,     // Qt_4_9
     QPalette::ToolTipText + 1,     // Qt_4_10
     QPalette::ToolTipText + 1,     // Qt_4_11
-#if QT_VERSION > 0x041101
-#error Add the datastream color role for this version
     QPalette::ToolTipText + 1,     // Qt_4_12
+#if QT_VERSION > 0x041200
+#error Add the datastream color role for this version
+    QPalette::ToolTipText + 1,     // Qt_4_13
 #endif
-    0                              // add the correct value for Qt_4_11 here later
+    0                              // add the correct value for Qt_4_13 here later
 };
 
 // Testing get/set functions