Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setting appVersion for QML from Version: in spec-file #66

Merged
merged 5 commits into from
Feb 6, 2024
Merged

Setting appVersion for QML from Version: in spec-file #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73ce0ff
[filecase.cpp] Add setting `appVersion` for QML from `VERSION`
Olf0 Feb 5, 2024
a7632f9
[filecase.pro] Set `VERSION` from `Version:` in spec-file
Olf0 Feb 5, 2024
7b261e4
[filecase.pro] Swap `DEFINES` statements
Olf0 Feb 5, 2024
ec7a5d9
[filecase.qml] Omit setting `appVersion` here
Olf0 Feb 5, 2024
b881cab
[filecase.cpp] Swap statements
Olf0 Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions filecase.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ CONFIG += sailfishapp
QT += core xml

DEFINES += QWEBDAVITEM_EXTENDED_PROPERTIES DEBUG_WEBDAV
DEFINES += VERSION=\\\"$${VERSION}\\\"

SOURCES += src/filecase.cpp \
src/browser.cpp \
Expand Down
2 changes: 0 additions & 2 deletions qml/filecase.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ ApplicationWindow
{
id: appWindow

property string appVersion: "0.4.2"

property string savedorientation: config.readConfig("Orientation", "auto")

property int pagesOrientations: savedorientation==="auto"? (Orientation.Portrait | Orientation.Landscape) :
Expand Down
1 change: 1 addition & 0 deletions src/filecase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ int main(int argc, char *argv[])

//window->rootContext()->setContextProperty("view", window.data());
//window->rootContext()->setContextProperty("app", app.data());
window->rootContext()->setContextProperty("appVersion", VERSION);
window->engine()->addImportPath("/usr/share/filecase/qml");

qmlRegisterType<Config>("FileCase", 1, 0, "Config");
Expand Down
Loading