From 9e4ebbdae91bcf55f1907b865bd0e8dbb248a7c2 Mon Sep 17 00:00:00 2001 From: Lucio Zambon <lucio.zambon@elettra.eu> Date: Mon, 14 Jun 2021 10:55:20 +0200 Subject: [PATCH] update bits --- Makefile | 3 +++ src/okintck_vlv_pos_ldm_02.ui | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 213353f..1be697b 100644 --- a/Makefile +++ b/Makefile @@ -225,6 +225,7 @@ DIST = /usr/local/qtango/include/qtango6/messages.pri \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/qt_config.prf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/exclusive_builds.prf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/toolchain.prf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/default_pre.prf \ @@ -431,6 +432,7 @@ Makefile: okintck_vlv_pos_ldm_02.pro /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g /usr/local/qt/5.11.1/gcc_64/mkspecs/features/qt_config.prf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/exclusive_builds.prf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/toolchain.prf \ /usr/local/qt/5.11.1/gcc_64/mkspecs/features/default_pre.prf \ @@ -634,6 +636,7 @@ Makefile: okintck_vlv_pos_ldm_02.pro /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g /usr/local/qt/5.11.1/gcc_64/mkspecs/features/qt_config.prf: /usr/local/qt/5.11.1/gcc_64/mkspecs/linux-g++/qmake.conf: /usr/local/qt/5.11.1/gcc_64/mkspecs/features/spec_post.prf: +.qmake.stash: /usr/local/qt/5.11.1/gcc_64/mkspecs/features/exclusive_builds.prf: /usr/local/qt/5.11.1/gcc_64/mkspecs/features/toolchain.prf: /usr/local/qt/5.11.1/gcc_64/mkspecs/features/default_pre.prf: diff --git a/src/okintck_vlv_pos_ldm_02.ui b/src/okintck_vlv_pos_ldm_02.ui index 6a99923..052e624 100755 --- a/src/okintck_vlv_pos_ldm_02.ui +++ b/src/okintck_vlv_pos_ldm_02.ui @@ -422,7 +422,7 @@ <string>NOK</string> </property> <property name="displayMask"> - <string>594</string> + <string>571</string> </property> <property name="source"> <string>srv-tango-padres-01:20000/padres/interlock/plc_int_ll.03/Stat_system</string> @@ -445,7 +445,7 @@ </font> </property> <property name="text"> - <string>VGFR_POS_LDM.03</string> + <string>SIP300_POS_LDM_03</string> </property> </widget> <widget class="QLabel" name="label_906"> @@ -750,7 +750,7 @@ <string>NOK</string> </property> <property name="displayMask"> - <string>569</string> + <string>570</string> </property> <property name="source"> <string>srv-tango-padres-01:20000/padres/interlock/plc_int_ll.03/Stat_system</string> @@ -1229,7 +1229,7 @@ </font> </property> <property name="text"> - <string>SIP300_POS_LDM_02</string> + <string>SIP300_POS_LDM_03</string> </property> </widget> <widget class="QLabel" name="label_912"> @@ -1514,7 +1514,7 @@ <string>NOK</string> </property> <property name="displayMask"> - <string>569</string> + <string>571</string> </property> <property name="source"> <string>srv-tango-padres-01:20000/padres/interlock/plc_int_ll.03/Stat_system</string> -- GitLab