Version 2.14.0

To be released tomorrow 2025-02-05
This commit is contained in:
gitlost 2025-02-04 15:17:47 +00:00
parent 01d72607c6
commit e38185121e
38 changed files with 91 additions and 101 deletions

View file

@ -85,7 +85,7 @@ CONFIG += warn_on thread qt
LIBS += -lQtZint
QMAKE_LIBDIR += ../backend_qt/release
LIBS += -lQt5Core
QMAKE_LIBDIR += C:/qt/5.15.2static/lib
QMAKE_LIBDIR += C:/qt/5.15.16static/lib
!contains(DEFINES, ZINT_NO_PNG) {
# Win

View file

@ -1,16 +1,16 @@
Harald Oehlmann
2021-06-24
2025-02-04
How to build qzint.exe using:
- QT 5.15.2 source package
- QT 5.15.16 source package
- MS Visual Studio 2015 (VC14)
Build static Qt:
---------------
- Go to: https://www.qt.io/offline-installers
- Download the zip "Qt 5.15.x source packages" (nearly 1 GB):
http://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip
- Unzip to C:\qt resulting in having the source in c:\qt\qt-everywhere-src-5.15.2
https://download.qt.io/official_releases/qt/5.15/5.15.16/single/qt-everywhere-opensource-src-5.15.16.zip
- Unzip to C:\ resulting in having the source in C:\qt-everywhere-opensource-src-5.15.16\qt-everywhere-src-5.15.16
- Install Python (https://www.python.org/downloads/windows/) and make it available within the path.
- Start the VS2015 x86 native console by the start menu entry:
@ -20,8 +20,8 @@ Build static Qt:
- Note: if "rc.exe" not available, install a Windows Kit and update PATH (e.g.):
set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x86;%PATH%"
cd C:\qt\qt-everywhere-src-5.15.2
configure.bat -static -release -prefix c:\qt\5.15.2static -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-freetype -opengl desktop -no-openssl -opensource -confirm-license -make libs -nomake tools -nomake examples -nomake tests -mp
cd C:\qt-everywhere-opensource-src-5.15.16\qt-everywhere-src-5.15.16
configure.bat -static -release -prefix c:\qt\5.15.16static -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-freetype -opengl desktop -no-openssl -opensource -confirm-license -make libs -nomake tools -nomake examples -nomake tests -mp
- One may set another destination folder after the -prefix option.
- Attention, the upper command is one long line.
nmake
@ -56,8 +56,8 @@ Build libpng:
Build zint:
-----------
set QTDIR=C:\Qt\5.15.2static
set PATH=C:\Qt\5.15.2static\bin;%PATH%
set QTDIR=C:\Qt\5.15.16static
set PATH=C:\Qt\5.15.16static\bin;%PATH%
set QMAKESPEC=win32-msvc
cd "%ZH%"
@ -71,13 +71,3 @@ Build zint:
nmake clean
nmake release
-> qtZint.exe is in the release folder
Note:
For me, qt5core.lib was not found in the last step.
I only found the solution to add:
QMAKE_LIBDIR += C:/qt/5.15.2static/lib
into frontend_qt.pro
There is for sure a better solution.

View file

@ -798,7 +798,7 @@ void MainWindow::about()
"<h2>Zint Barcode Studio %1</h2>"
"<p>A free barcode generator</p>"
"<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>.</p>"
"<a href=\"https://www.zint.org.uk\">https://www.zint.org.uk</a>.</p>"
"<p>Copyright &copy; 2006-2025 Robin Stuart and others.<br>"
"Qt backend by BogDan Vatra.<br>"
"Released under GNU GPL 3.0 or later.</p>"

View file

@ -5,8 +5,8 @@
#include <winver.h>
#define VER_FILEVERSION 2,13,0,9
#define VER_FILEVERSION_STR "2.13.0.9\0"
#define VER_FILEVERSION 2,14,0,0
#define VER_FILEVERSION_STR "2.14.0.0\0"
#ifdef GCC_WINDRES