Commit 6469da0598cf96d35e7268390d3e1a69fd4566d3

Authored by 김태훈
1 parent b3e47756e6
Exists in fhd

컴파일 오류 제거

app/gui/oven_control/burnertestwindow.ui
@@ -450,15 +450,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -450,15 +450,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
450 </color> 450 </color>
451 </brush> 451 </brush>
452 </colorrole> 452 </colorrole>
453 - <colorrole role="PlaceholderText">  
454 - <brush brushstyle="NoBrush">  
455 - <color alpha="128">  
456 - <red>255</red>  
457 - <green>255</green>  
458 - <blue>255</blue>  
459 - </color>  
460 - </brush>  
461 - </colorrole>  
462 </active> 453 </active>
463 <inactive> 454 <inactive>
464 <colorrole role="WindowText"> 455 <colorrole role="WindowText">
@@ -596,15 +587,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -596,15 +587,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
596 </color> 587 </color>
597 </brush> 588 </brush>
598 </colorrole> 589 </colorrole>
599 - <colorrole role="PlaceholderText">  
600 - <brush brushstyle="NoBrush">  
601 - <color alpha="128">  
602 - <red>255</red>  
603 - <green>255</green>  
604 - <blue>255</blue>  
605 - </color>  
606 - </brush>  
607 - </colorrole>  
608 </inactive> 590 </inactive>
609 <disabled> 591 <disabled>
610 <colorrole role="WindowText"> 592 <colorrole role="WindowText">
@@ -742,15 +724,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -742,15 +724,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
742 </color> 724 </color>
743 </brush> 725 </brush>
744 </colorrole> 726 </colorrole>
745 - <colorrole role="PlaceholderText">  
746 - <brush brushstyle="NoBrush">  
747 - <color alpha="128">  
748 - <red>255</red>  
749 - <green>255</green>  
750 - <blue>255</blue>  
751 - </color>  
752 - </brush>  
753 - </colorrole>  
754 </disabled> 727 </disabled>
755 </palette> 728 </palette>
756 </property> 729 </property>
@@ -916,15 +889,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -916,15 +889,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
916 </color> 889 </color>
917 </brush> 890 </brush>
918 </colorrole> 891 </colorrole>
919 - <colorrole role="PlaceholderText">  
920 - <brush brushstyle="NoBrush">  
921 - <color alpha="128">  
922 - <red>255</red>  
923 - <green>255</green>  
924 - <blue>255</blue>  
925 - </color>  
926 - </brush>  
927 - </colorrole>  
928 </active> 892 </active>
929 <inactive> 893 <inactive>
930 <colorrole role="WindowText"> 894 <colorrole role="WindowText">
@@ -1062,15 +1026,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1062,15 +1026,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1062 </color> 1026 </color>
1063 </brush> 1027 </brush>
1064 </colorrole> 1028 </colorrole>
1065 - <colorrole role="PlaceholderText">  
1066 - <brush brushstyle="NoBrush">  
1067 - <color alpha="128">  
1068 - <red>255</red>  
1069 - <green>255</green>  
1070 - <blue>255</blue>  
1071 - </color>  
1072 - </brush>  
1073 - </colorrole>  
1074 </inactive> 1029 </inactive>
1075 <disabled> 1030 <disabled>
1076 <colorrole role="WindowText"> 1031 <colorrole role="WindowText">
@@ -1208,15 +1163,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1208,15 +1163,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1208 </color> 1163 </color>
1209 </brush> 1164 </brush>
1210 </colorrole> 1165 </colorrole>
1211 - <colorrole role="PlaceholderText">  
1212 - <brush brushstyle="NoBrush">  
1213 - <color alpha="128">  
1214 - <red>255</red>  
1215 - <green>255</green>  
1216 - <blue>255</blue>  
1217 - </color>  
1218 - </brush>  
1219 - </colorrole>  
1220 </disabled> 1166 </disabled>
1221 </palette> 1167 </palette>
1222 </property> 1168 </property>
@@ -1382,15 +1328,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1382,15 +1328,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1382 </color> 1328 </color>
1383 </brush> 1329 </brush>
1384 </colorrole> 1330 </colorrole>
1385 - <colorrole role="PlaceholderText">  
1386 - <brush brushstyle="NoBrush">  
1387 - <color alpha="128">  
1388 - <red>255</red>  
1389 - <green>255</green>  
1390 - <blue>255</blue>  
1391 - </color>  
1392 - </brush>  
1393 - </colorrole>  
1394 </active> 1331 </active>
1395 <inactive> 1332 <inactive>
1396 <colorrole role="WindowText"> 1333 <colorrole role="WindowText">
@@ -1528,15 +1465,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1528,15 +1465,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1528 </color> 1465 </color>
1529 </brush> 1466 </brush>
1530 </colorrole> 1467 </colorrole>
1531 - <colorrole role="PlaceholderText">  
1532 - <brush brushstyle="NoBrush">  
1533 - <color alpha="128">  
1534 - <red>255</red>  
1535 - <green>255</green>  
1536 - <blue>255</blue>  
1537 - </color>  
1538 - </brush>  
1539 - </colorrole>  
1540 </inactive> 1468 </inactive>
1541 <disabled> 1469 <disabled>
1542 <colorrole role="WindowText"> 1470 <colorrole role="WindowText">
@@ -1674,15 +1602,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1674,15 +1602,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1674 </color> 1602 </color>
1675 </brush> 1603 </brush>
1676 </colorrole> 1604 </colorrole>
1677 - <colorrole role="PlaceholderText">  
1678 - <brush brushstyle="NoBrush">  
1679 - <color alpha="128">  
1680 - <red>255</red>  
1681 - <green>255</green>  
1682 - <blue>255</blue>  
1683 - </color>  
1684 - </brush>  
1685 - </colorrole>  
1686 </disabled> 1605 </disabled>
1687 </palette> 1606 </palette>
1688 </property> 1607 </property>
@@ -1848,15 +1767,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1848,15 +1767,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1848 </color> 1767 </color>
1849 </brush> 1768 </brush>
1850 </colorrole> 1769 </colorrole>
1851 - <colorrole role="PlaceholderText">  
1852 - <brush brushstyle="NoBrush">  
1853 - <color alpha="128">  
1854 - <red>255</red>  
1855 - <green>255</green>  
1856 - <blue>255</blue>  
1857 - </color>  
1858 - </brush>  
1859 - </colorrole>  
1860 </active> 1770 </active>
1861 <inactive> 1771 <inactive>
1862 <colorrole role="WindowText"> 1772 <colorrole role="WindowText">
@@ -1994,15 +1904,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1994,15 +1904,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1994 </color> 1904 </color>
1995 </brush> 1905 </brush>
1996 </colorrole> 1906 </colorrole>
1997 - <colorrole role="PlaceholderText">  
1998 - <brush brushstyle="NoBrush">  
1999 - <color alpha="128">  
2000 - <red>255</red>  
2001 - <green>255</green>  
2002 - <blue>255</blue>  
2003 - </color>  
2004 - </brush>  
2005 - </colorrole>  
2006 </inactive> 1907 </inactive>
2007 <disabled> 1908 <disabled>
2008 <colorrole role="WindowText"> 1909 <colorrole role="WindowText">
@@ -2140,15 +2041,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -2140,15 +2041,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
2140 </color> 2041 </color>
2141 </brush> 2042 </brush>
2142 </colorrole> 2043 </colorrole>
2143 - <colorrole role="PlaceholderText">  
2144 - <brush brushstyle="NoBrush">  
2145 - <color alpha="128">  
2146 - <red>255</red>  
2147 - <green>255</green>  
2148 - <blue>255</blue>  
2149 - </color>  
2150 - </brush>  
2151 - </colorrole>  
2152 </disabled> 2044 </disabled>
2153 </palette> 2045 </palette>
2154 </property> 2046 </property>
app/gui/oven_control/valvetestwindow.ui
@@ -445,15 +445,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -445,15 +445,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
445 </color> 445 </color>
446 </brush> 446 </brush>
447 </colorrole> 447 </colorrole>
448 - <colorrole role="PlaceholderText">  
449 - <brush brushstyle="NoBrush">  
450 - <color alpha="128">  
451 - <red>255</red>  
452 - <green>255</green>  
453 - <blue>255</blue>  
454 - </color>  
455 - </brush>  
456 - </colorrole>  
457 </active> 448 </active>
458 <inactive> 449 <inactive>
459 <colorrole role="WindowText"> 450 <colorrole role="WindowText">
@@ -591,15 +582,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -591,15 +582,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
591 </color> 582 </color>
592 </brush> 583 </brush>
593 </colorrole> 584 </colorrole>
594 - <colorrole role="PlaceholderText">  
595 - <brush brushstyle="NoBrush">  
596 - <color alpha="128">  
597 - <red>255</red>  
598 - <green>255</green>  
599 - <blue>255</blue>  
600 - </color>  
601 - </brush>  
602 - </colorrole>  
603 </inactive> 585 </inactive>
604 <disabled> 586 <disabled>
605 <colorrole role="WindowText"> 587 <colorrole role="WindowText">
@@ -737,15 +719,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -737,15 +719,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
737 </color> 719 </color>
738 </brush> 720 </brush>
739 </colorrole> 721 </colorrole>
740 - <colorrole role="PlaceholderText">  
741 - <brush brushstyle="NoBrush">  
742 - <color alpha="128">  
743 - <red>255</red>  
744 - <green>255</green>  
745 - <blue>255</blue>  
746 - </color>  
747 - </brush>  
748 - </colorrole>  
749 </disabled> 722 </disabled>
750 </palette> 723 </palette>
751 </property> 724 </property>