Wasm: Initialize resources and don't shadow name
e.g. the gallery has an own resource called "icons" Resolves #409
This commit is contained in:
parent
3f77b01737
commit
0c8dc6db00
@ -9,7 +9,7 @@ set(SOURCES
|
|||||||
QskFluent2Skin.h QskFluent2Skin.cpp
|
QskFluent2Skin.h QskFluent2Skin.cpp
|
||||||
QskFluent2SkinFactory.h QskFluent2SkinFactory.cpp
|
QskFluent2SkinFactory.h QskFluent2SkinFactory.cpp
|
||||||
)
|
)
|
||||||
qt_add_resources(SOURCES icons.qrc)
|
qt_add_resources(SOURCES QskFluent2Icons.qrc)
|
||||||
|
|
||||||
qsk_add_plugin(fluent2skin skins QskFluent2SkinFactory ${SOURCES})
|
qsk_add_plugin(fluent2skin skins QskFluent2SkinFactory ${SOURCES})
|
||||||
set_target_properties(fluent2skin PROPERTIES DEFINE_SYMBOL QSK_FLUENT2_MAKEDLL )
|
set_target_properties(fluent2skin PROPERTIES DEFINE_SYMBOL QSK_FLUENT2_MAKEDLL )
|
||||||
|
@ -103,6 +103,13 @@
|
|||||||
#include <qguiapplication.h>
|
#include <qguiapplication.h>
|
||||||
#include <qfontinfo.h>
|
#include <qfontinfo.h>
|
||||||
|
|
||||||
|
static void qskFluent2InitResources()
|
||||||
|
{
|
||||||
|
Q_INIT_RESOURCE( QskFluent2Icons );
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_CONSTRUCTOR_FUNCTION( qskFluent2InitResources )
|
||||||
|
|
||||||
namespace Fluent2
|
namespace Fluent2
|
||||||
{
|
{
|
||||||
using F = QskFontRole;
|
using F = QskFontRole;
|
||||||
|
@ -7,7 +7,7 @@ set(SOURCES
|
|||||||
QskMaterial3Global.h QskMaterial3Skin.h QskMaterial3Skin.cpp
|
QskMaterial3Global.h QskMaterial3Skin.h QskMaterial3Skin.cpp
|
||||||
QskMaterial3SkinFactory.h QskMaterial3SkinFactory.cpp
|
QskMaterial3SkinFactory.h QskMaterial3SkinFactory.cpp
|
||||||
)
|
)
|
||||||
qt_add_resources(SOURCES icons.qrc)
|
qt_add_resources(SOURCES QskMaterial3Icons.qrc)
|
||||||
|
|
||||||
qsk_add_plugin(material3skin skins QskMaterial3SkinFactory ${SOURCES})
|
qsk_add_plugin(material3skin skins QskMaterial3SkinFactory ${SOURCES})
|
||||||
set_target_properties(material3skin PROPERTIES DEFINE_SYMBOL QSK_MATERIAL3_MAKEDLL )
|
set_target_properties(material3skin PROPERTIES DEFINE_SYMBOL QSK_MATERIAL3_MAKEDLL )
|
||||||
|
@ -64,6 +64,13 @@
|
|||||||
#include <qguiapplication.h>
|
#include <qguiapplication.h>
|
||||||
#include <qfontinfo.h>
|
#include <qfontinfo.h>
|
||||||
|
|
||||||
|
static void qskMaterial3InitResources()
|
||||||
|
{
|
||||||
|
Q_INIT_RESOURCE( QskMaterial3Icons );
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_CONSTRUCTOR_FUNCTION( qskMaterial3InitResources )
|
||||||
|
|
||||||
static const int qskDuration = 150;
|
static const int qskDuration = 150;
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
|
Loading…
x
Reference in New Issue
Block a user