Merge remote-tracking branch 'upstream/master' into newqt2

2022-04-21 16:32:48 +06:00
parent 314bf5ad06 7d6ad0d650
commit 6edc2a4c2b
66 changed files with 1553 additions and 19861 deletions
--- a/src/qt_resources.qrc
+++ b/src/qt_resources.qrc
@@ -57,4 +57,8 @@
        <file>win/icons/send_cae.ico</file>
        <file>win/icons/settings.ico</file>
    </qresource>
+    <qresource prefix="/">
+        <file alias="/texture_vert.spv">qt/texture_vert.spv</file>
+        <file alias="/texture_frag.spv">qt/texture_frag.spv</file>
+    </qresource>
 </RCC>