Commit dfc96479 authored by Georges Khaznadar's avatar Georges Khaznadar

Merge branch 'mr-use-qt5-toolchain' into 'master'

Use Qt5 build toolchain

See merge request georgesk/expeyes!1
parents a562190d 9da7f88b
......@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 10), quilt,
python3-all, python-all, dh-python,
gcc-avr, binutils-avr, avr-libc (>=1:1.8.0+Atmel3.5.0),
pkg-config, libgtk2.0-dev, x11proto-randr-dev (>= 1.5.0),
pyqt4-dev-tools, qt4-linguist-tools
pyqt5-dev-tools, qttools5-dev-tools
Standards-Version: 4.1.5
Homepage: http://expeyes.in/
Vcs-Browser: https://salsa.debian.org/georgesk/expeyes
......
From: Boyuan Yang <073plan@gmail.com>
Date: Fri, 20 Jul 2018 13:05:17 +0800
Subject: Use Qt5 lrelease / pylupdate5 instead of qt4 tools
---
eyes17/lang/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eyes17/lang/Makefile b/eyes17/lang/Makefile
index 8825a15..004b1e3 100644
--- a/eyes17/lang/Makefile
+++ b/eyes17/lang/Makefile
@@ -2,12 +2,12 @@ DESTDIR =
TS_FILES = $(shell ls *.ts)
QM_FILES = $(patsubst %.ts, %.qm, $(TS_FILES))
SOURCES = $(shell ls ../*py ../code/*.py)
-PYLUPDATE ?= pylupdate4
+PYLUPDATE ?= pylupdate5
all: $(QM_FILES)
$(QM_FILES): $(TS_FILES)
- lrelease-qt4 eyes17.pro
+ lrelease eyes17.pro
$(TS_FILES): eyes17.pro
$(PYLUPDATE) eyes17.pro
0001-Use-Qt5-lrelease-pylupdate5-instead-of-qt4-tools.patch
......@@ -14,6 +14,8 @@ DEB_BUILD_MAINT_OPTIONS=reproducible=-timeless
LD_LIBRARY_PATH += debian/libexpeyes1/usr/lib
export DEB_BUILD_HARDENING=1
export QT_SELECT := 5
%:
dh $@ --with python2,python3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment