mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
organize qml files in subdirectories
This makes the organization of the qml files a bit more fine-grained, it prevents mixing of .cpp and QML files, and also of what's compiled, and what's included in the app as qrc data. In particular: - subsurface specific QML items go into the qml/ subdirectory - theme and unit definitions to into qml/theme subdirectory (they already were located in a theme directory) - generic components, such as our Label goes into qml/components This facilitates sharing of functionality and identifying common stuff better. Ideally, we can pull qml/theme and qml/components from a standardized set at some point, so we don't have to maintain that code. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
95ac4c4454
commit
aae4a326f4
15 changed files with 3 additions and 3 deletions
|
@ -353,7 +353,7 @@ if(SUBSURFACE_MOBILE)
|
||||||
subsurface-mobile-helper.cpp
|
subsurface-mobile-helper.cpp
|
||||||
)
|
)
|
||||||
add_definitions(-DSUBSURFACE_MOBILE)
|
add_definitions(-DSUBSURFACE_MOBILE)
|
||||||
qt5_add_resources(MOBILE_RESOURCES qt-mobile/mobile-resources.qrc)
|
qt5_add_resources(MOBILE_RESOURCES qt-mobile/qml/mobile-resources.qrc)
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
add_library(subsurface-mobile SHARED ${MOBILE_SRC} ${SUBSURFACE_PKG} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES})
|
add_library(subsurface-mobile SHARED ${MOBILE_SRC} ${SUBSURFACE_PKG} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES})
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
<file>Log.qml</file>
|
<file>Log.qml</file>
|
||||||
<file>TopBar.qml</file>
|
<file>TopBar.qml</file>
|
||||||
<file>ThemeTest.qml</file>
|
<file>ThemeTest.qml</file>
|
||||||
<file>Label.qml</file>
|
<file alias="Label.qml">components/Label.qml</file>
|
||||||
<file alias="subsurface-mobile-icon.png">../icons/subsurface-mobile-icon.png</file>
|
<file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/qml/theme">
|
<qresource prefix="/qml/theme">
|
||||||
<file alias="Theme.qml">theme/Theme.qml</file>
|
<file alias="Theme.qml">theme/Theme.qml</file>
|
Loading…
Reference in a new issue