diff --git a/lisp/local-projects/app/app.lisp b/lisp/local-projects/app/app.lisp index e0f2bef..9d42630 100644 --- a/lisp/local-projects/app/app.lisp +++ b/lisp/local-projects/app/app.lisp @@ -1,9 +1,6 @@ (defpackage :app (:use :cl :eql) - (:export #:start-slynk - #:stop-slynk - #:start - #:reload-qml)) + (:export #:start)) (in-package :app) (qrequire :quick) @@ -33,15 +30,6 @@ (#.|QQuickView.Ready| (qml-reloaded)))))) -(defun reload-qml (&optional (url "http://localhost:8000/")) - "Reload QML file from an url, directly on the device." - (qrun* - (let ((src (|toString| (|source| qml:*quick-view*)))) - (if (x:starts-with (concatenate 'string "file://" qml:*root*) src) - (|setSource| qml:*quick-view* (qnew "QUrl(QString)" (x:string-substitute url (concatenate 'string "file://" qml:*root*) src))) - (qml:reload)) - (|toString| (|source| qml:*quick-view*))))) - (defun qml-reloaded () ;; re-ini ) diff --git a/src/eql5-sfos.cc b/src/eql5-sfos.cc index 018102d..f95f61b 100644 --- a/src/eql5-sfos.cc +++ b/src/eql5-sfos.cc @@ -32,7 +32,12 @@ int main(int argc, char *argv[]) EQL eql; eql.exec (init_app); - eql_fun ("qml:ini-sailfish", Q_ARG (QUrl, SailfishApp::pathToMainQml ()), + + QUrl url = SailfishApp::pathToMainQml(); + if (argc > 1) + url = argv[argc - 1]; + + eql_fun ("qml:ini-sailfish", Q_ARG (QUrl, url), Q_ARG (QUrl, SailfishApp::pathTo ("")), Q_ARG (QQuickView*, view.data ()), Q_ARG(bool, true)); }