mirror of
https://github.com/status-im/status-desktop.git
synced 2025-02-16 08:37:12 +00:00
chore: add StatusQ as dependency
This commit does a couple of things: - add StatusQ as a dependency (https://github.com/status-im/StatusQ) our emerging component library - updates the rcc generation script to follow symlinks as well - add qrc:/./StatusQ/src as import path At the time of creating this commit `StatusQ` provides only the StatusIcon component, but more will be added in the future.
This commit is contained in:
parent
f5dacb40b1
commit
7329522a28
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -100,3 +100,9 @@
|
|||||||
[submodule "vendor/nim-confutils"]
|
[submodule "vendor/nim-confutils"]
|
||||||
path = vendor/nim-confutils
|
path = vendor/nim-confutils
|
||||||
url = https://github.com/status-im/nim-confutils.git
|
url = https://github.com/status-im/nim-confutils.git
|
||||||
|
[submodule "vendor/status-qml"]
|
||||||
|
path = vendor/status-qml
|
||||||
|
url = https://github.com/PascalPrecht/status-qml
|
||||||
|
[submodule "ui/StatusQ"]
|
||||||
|
path = ui/StatusQ
|
||||||
|
url = https://github.com/status-im/StatusQ
|
||||||
|
@ -80,6 +80,7 @@ proc mainProc() =
|
|||||||
let networkAccessFactory = newQNetworkAccessManagerFactory(TMPDIR & "netcache")
|
let networkAccessFactory = newQNetworkAccessManagerFactory(TMPDIR & "netcache")
|
||||||
|
|
||||||
let engine = newQQmlApplicationEngine()
|
let engine = newQQmlApplicationEngine()
|
||||||
|
engine.addImportPath("qrc:/./StatusQ/src")
|
||||||
engine.setNetworkAccessManagerFactory(networkAccessFactory)
|
engine.setNetworkAccessManagerFactory(networkAccessFactory)
|
||||||
|
|
||||||
let netAccMgr = newQNetworkAccessManager(engine.getNetworkAccessManager())
|
let netAccMgr = newQNetworkAccessManager(engine.getNetworkAccessManager())
|
||||||
|
1
ui/StatusQ
Submodule
1
ui/StatusQ
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit eb87aa4bcbd3401345c18f9ed86c4cf408ab33cd
|
@ -4,7 +4,7 @@ QRC=./resources.qrc
|
|||||||
echo '<!DOCTYPE RCC>' > $QRC
|
echo '<!DOCTYPE RCC>' > $QRC
|
||||||
echo '<RCC version="1.0">' >> $QRC
|
echo '<RCC version="1.0">' >> $QRC
|
||||||
echo ' <qresource>' >> $QRC
|
echo ' <qresource>' >> $QRC
|
||||||
for a in $(find . -not -name "*.pro" -not -name "*.rcc" -not -name "*.sh" -not -name "*.qrc" )
|
for a in $(find -L . -not -name "*.pro" -not -name "*.rcc" -not -name "*.sh" -not -name "*.qrc" -not -name ".git" -not -name ".gitignore" )
|
||||||
do
|
do
|
||||||
if [ ! -d "$a" ]; then
|
if [ ! -d "$a" ]; then
|
||||||
echo ' <file>'$a'</file>' >> $QRC
|
echo ' <file>'$a'</file>' >> $QRC
|
||||||
|
Loading…
x
Reference in New Issue
Block a user