mirror of
https://github.com/spalencsar/bearwave.git
synced 2026-07-06 22:24:17 +02:00
fix(qrc): correct QML resource paths for AUR and release builds
The QML refactor in 1.0.4 used prefix /qml with file paths like qml/Main.qml, embedding resources at qrc:/qml/qml/Main.qml while main.cpp loads qrc:/qml/Main.qml. Use prefix / so paths match. Also derive the displayed app version from CMake PROJECT_VERSION and add a qrc_resources_test to prevent this regression in CI.
This commit is contained in:
@@ -18,6 +18,10 @@ set(SOURCES
|
||||
# Create executable
|
||||
add_executable(bearwave ${SOURCES})
|
||||
|
||||
target_compile_definitions(bearwave PRIVATE
|
||||
BEARWAVE_VERSION="${PROJECT_VERSION}"
|
||||
)
|
||||
|
||||
# Qt Resources
|
||||
target_sources(bearwave PRIVATE qml.qrc)
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
|
||||
QApplication::setApplicationName(QStringLiteral("BearWave"));
|
||||
QApplication::setDesktopFileName(QStringLiteral("de.nerdbear.bearwave"));
|
||||
QApplication::setOrganizationName(QStringLiteral("BearWave"));
|
||||
QApplication::setApplicationVersion(QStringLiteral("1.0.5"));
|
||||
QApplication::setApplicationVersion(QStringLiteral(BEARWAVE_VERSION));
|
||||
|
||||
QApplication app(argc, argv);
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<RCC>
|
||||
<qresource prefix="/qml">
|
||||
<qresource prefix="/">
|
||||
<file>qml/Main.qml</file>
|
||||
<file>qml/theme/qmldir</file>
|
||||
<file>qml/theme/BearTheme.qml</file>
|
||||
|
||||
Reference in New Issue
Block a user