更新代码

2022-01-14 16:55:23 +08:00 · 2022-01-14 16:55:23 +08:00 · 17ac8c113c
parent ac55a4ecf5
commit 17ac8c113c
13 changed files with 9 additions and 1 deletions
--- a/third/qcustomplotdemo/qcustomplotdemo.pro
+++ b/third/qcustomplotdemo/qcustomplotdemo.pro
@ -7,8 +7,11 @@ TEMPLATE    = app
 DESTDIR     = $$PWD/../bin

 CONFIG      += warn_off
-RESOURCES   += main.qrc
 SOURCES     += main.cpp
+RESOURCES   += qrc/main.qrc
+wasm {
+RESOURCES   += qrc/font.qrc
+}

 INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD/frmcustom
--- a/third/qcustomplotdemo/qrc/data/data0.txt
+++ b/third/qcustomplotdemo/qrc/data/data0.txt
--- a/third/qcustomplotdemo/qrc/data/data1.txt
+++ b/third/qcustomplotdemo/qrc/data/data1.txt
--- a/third/qcustomplotdemo/qrc/data/data2.txt
+++ b/third/qcustomplotdemo/qrc/data/data2.txt
--- a/third/qcustomplotdemo/qrc/font.qrc
+++ b/third/qcustomplotdemo/qrc/font.qrc
@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>font/DroidSansFallback.ttf</file>
+    </qresource>
+</RCC>
--- a/third/qcustomplotdemo/qrc/font/DroidSansFallback.ttf
+++ b/third/qcustomplotdemo/qrc/font/DroidSansFallback.ttf
--- a/third/qcustomplotdemo/qrc/font/fontawesome-webfont.ttf
+++ b/third/qcustomplotdemo/qrc/font/fontawesome-webfont.ttf
--- a/third/qcustomplotdemo/qrc/font/iconfont.ttf
+++ b/third/qcustomplotdemo/qrc/font/iconfont.ttf
--- a/third/qcustomplotdemo/qrc/font/pe-icon-set-weather.ttf
+++ b/third/qcustomplotdemo/qrc/font/pe-icon-set-weather.ttf
--- a/third/qcustomplotdemo/qrc/image/bg1.jpg
+++ b/third/qcustomplotdemo/qrc/image/bg1.jpg
--- a/third/qcustomplotdemo/qrc/image/bg2.jpg
+++ b/third/qcustomplotdemo/qrc/image/bg2.jpg
--- a/third/qcustomplotdemo/qrc/image/data.png
+++ b/third/qcustomplotdemo/qrc/image/data.png
--- a/third/qcustomplotdemo/qrc/main.qrc
+++ b/third/qcustomplotdemo/qrc/main.qrc