mirror of
https://git.code.sf.net/p/zint/code
synced 2026-01-10 05:26:00 +00:00
GUI: DAFT: re-squash tracker examples back to 2 lines so should
always fit (wasn't on Fedora/GNONE) but make non-wrap CMake: remove Qt6 regex detect nonsense and note must specify `-DZINT_QT6=ON` in "README.linux"
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
# Copyright (C) 2008 by BogDan Vatra < bogdan@licentia.eu >
|
||||
# Copyright (C) 2009-2025 Robin Stuart <rstuart114@gmail.com>
|
||||
# Copyright (C) 2009-2026 Robin Stuart <rstuart114@gmail.com>
|
||||
# vim: set ts=4 sw=4 et :
|
||||
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
@@ -154,7 +154,7 @@ endif()
|
||||
|
||||
if(NOT ZINT_USE_QT)
|
||||
message(STATUS "Qt support was disabled for this build")
|
||||
elseif(ZINT_QT6 OR ($ENV{CMAKE_PREFIX_PATH} MATCHES "6[.][0-9][.][0-9]"))
|
||||
elseif(ZINT_QT6)
|
||||
set(USE_QT6 TRUE)
|
||||
message(STATUS "Using Qt6")
|
||||
cmake_policy(SET CMP0012 NEW) # Recognize constants in if()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
% README.linux 2025-12-15
|
||||
% README.linux 2026-01-01
|
||||
% Tested on Ubuntu 20.04.4 LTS, Ubuntu 22.04 LTS, Ubuntu 24.04 LTS and
|
||||
% Fedora Linux 43 (Workstation Edition)
|
||||
|
||||
@@ -75,7 +75,7 @@ or Ubuntu 20.04
|
||||
|
||||
sudo apt install qt5-default qt5-uitools
|
||||
|
||||
or Fedora (not recommended)
|
||||
or Fedora
|
||||
|
||||
sudo dnf install qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static qt5-qtsvg-devel
|
||||
|
||||
@@ -119,6 +119,10 @@ The rest is standard CMake
|
||||
make
|
||||
sudo make install
|
||||
|
||||
Note if using Qt6, need to specify
|
||||
|
||||
cmake -DZINT_QT6=ON ..
|
||||
|
||||
|
||||
4. Run
|
||||
======
|
||||
|
||||
Binary file not shown.
@@ -115,9 +115,8 @@
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Examples of tracker ratios:
|
||||
Australia Post 26%
|
||||
Dutch Post and Royal Mail 25.6%, Japan Post 33%
|
||||
PLANET and POSTNET 25% (Tracker & Ascender only)
|
||||
Australia Post 26%, Dutch Post & Royal Mail 25.6%, Japan Post 33%
|
||||
PLANET & POSTNET 25% (Tracker/Ascender only)
|
||||
USPS Intelligent Mail 33.1%
|
||||
</string>
|
||||
</property>
|
||||
@@ -128,7 +127,7 @@
|
||||
<set>Qt::AlignLeft</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Reference in New Issue
Block a user