revisions and simplifiactions of app.pro file, remove obsolete app.qrc file

examples/app-template/app.pro

@@ -1,9 +1,5 @@
 # changes to these files will re-compile the Lisp library when running 'make'
-LISP_FILES = \
-  lisp/package.lisp \
-  lisp/main.lisp \
-  app.asd \
-  make.lisp
+LISP_FILES = $$files(lisp/*) app.asd make.lisp
 
 android {
   lisp.commands = $$(ECL_ANDROID)/../ecl-android-host/bin/ecl \
@@ -19,6 +15,7 @@ lisp.input  = LISP_FILES
 lisp.output = tmp/libapp.a
 
 QMAKE_EXTRA_COMPILERS += lisp
+PRE_TARGETDEPS        += tmp/libapp.a
 
 QT          += quick qml
 TEMPLATE    = app
@@ -28,8 +25,8 @@ INCLUDEPATH = /usr/local/include
 LIBS        = -L/usr/local/lib -lecl
 DESTDIR     = .
 TARGET      = app
-OBJECTS_DIR = ./tmp
-MOC_DIR     = ./tmp
+OBJECTS_DIR = tmp
+MOC_DIR     = tmp
 
 linux: LIBS += -L../../../platforms/linux/lib
 macx:  LIBS += -L../../../platforms/macos/lib
@@ -42,7 +39,7 @@ android {
 
   ANDROID_ABIS               = "arm64-v8a"
   ANDROID_EXTRA_LIBS         += $$(ECL_ANDROID)/lib/libecl.so
-  #ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android/sources
+  #ANDROID_PACKAGE_SOURCE_DIR = ../platforms/android
 }
 
 ios {
@@ -52,9 +49,9 @@ ios {
   LIBS        += -L../../../platforms/ios/lib
 }
 
-LIBS      += -llqml -llisp -Ltmp -lapp
-SOURCES   += ../../src/cpp/main.cpp
-RESOURCES = app.qrc
+LIBS    += -llqml -llisp -Ltmp -lapp
+SOURCES += ../../src/cpp/main.cpp
+
+RESOURCES = $$files(qml/*)
 
 QMAKE_CXXFLAGS += -std=c++17
-

examples/app-template/app.qrc

@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-  <file>qml/main.qml</file>
-</qresource>
-</RCC>

examples/app-template/build-android/install-run.sh

@@ -1,2 +1,3 @@
+# install/update (keeps app data)
 adb install -r android-build/*.apk
 adb shell am start -n org.qtproject.example.app/org.qtproject.qt5.android.bindings.QtActivity # Qt5

examples/app-template/ql-libs.lisp

@@ -1,3 +1,3 @@
 ;;; define here eventual Quicklisp dependencies
-;;; e.g. (ql:quickload :alessandria)
+;;; e.g. (ql:quickload :alexandria)
 

examples/app-template/readme-build.md

@@ -36,7 +36,7 @@ $ cd build-android
 $ qmake-android ../app.pro
 $ make apk
 
-$ ./install.sh
+$ ./install-run.sh
 ```
 Log note: for showing only your own messages, see `log.sh`.
 

examples/app-template/readme.md

@@ -1,7 +1,6 @@
 
 Run
 ---
-
 ```
 lqml run.lisp
 ```

examples/planets/app.qrc

@@ -1,28 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-
-  <file>qml/main.qml</file>
-
-  <file>qml/img/earth-map.jpg</file>
-  <file>qml/img/earth.png</file>
-  <file>qml/img/jupiter-map.jpg</file>
-  <file>qml/img/jupiter.png</file>
-  <file>qml/img/mars-map.jpg</file>
-  <file>qml/img/mars.png</file>
-  <file>qml/img/mercury-map.jpg</file>
-  <file>qml/img/mercury.png</file>
-  <file>qml/img/moon-map.jpg</file>
-  <file>qml/img/moon.png</file>
-  <file>qml/img/neptune-map.jpg</file>
-  <file>qml/img/neptune.png</file>
-  <file>qml/img/saturn-map.jpg</file>
-  <file>qml/img/saturn.png</file>
-  <file>qml/img/sun-map.jpg</file>
-  <file>qml/img/sun.png</file>
-  <file>qml/img/uranus-map.jpg</file>
-  <file>qml/img/uranus.png</file>
-  <file>qml/img/venus-map.jpg</file>
-  <file>qml/img/venus.png</file>
-
-</qresource>
-</RCC>

platforms/android/cross-compile.lisp

@@ -31,7 +31,7 @@
                                  " -DANDROID -DPLATFORM_ANDROID -O2 -fPIC -fno-common -D_THREAD_SAFE -I"
                                  *ecl-android* "/build/gmp")
       c::*ld-flags*        (cc "-L" *ecl-android* "/lib -lecl -ldl -lm "
-                                 "-L" *ndk-toolchain* "/sysroot/usr/lib/aarch64-linux-android/")
+                               "-L" *ndk-toolchain* "/sysroot/usr/lib/aarch64-linux-android/")
       c::*ld-rpath*        nil
       c::*ld-shared-flags* (cc "-shared " c::*ld-flags*)
       c::*ld-bundle-flags* c::*ld-shared-flags*)

platforms/ios/cross-compile.lisp

@@ -3,7 +3,7 @@
 ;;; expects the below environment variables to be set in a script which
 ;;; needs to call this file
 
-(defvar *architecture*  "aarch64-apple-darwin")
+(defvar *architecture* "aarch64-apple-darwin")
 
 (pushnew :ios     *features*)
 (pushnew :aarch64 *features*)

readme-qml-live-preview-and-slime.md

@@ -27,7 +27,7 @@ the tree view on the left, and any change to QML will be shown immediately in
 the running app, while you are typing!
 
 Additionally you may now also run `M-x slime-connect` from Emacs (the Swank
-server should already run, see 'Application Ouput' at the bottom of Qt
+server should already be running, see 'Application Ouput' at the bottom of Qt
 Creator).
 
 [Screenshot](screenshots/qml-live-preview-and-slime.jpg)

src/lisp/ecl-ext.lisp

@@ -2,10 +2,13 @@
 
 (in-package :qml)
 
+(defun %ensure-permissions (a))
 (defun %js (a b))
 (defun pixel-ratio ())
 (defun %qapropos (a b c))
 (defun qchildren (a))
+(defun qcopy-file (a b))
+(defun qdirectory (a))
 (defun qescape (a))
 (defun %qexec (a))
 (defun qexit ())

src/lisp/ini.lisp

@@ -12,17 +12,20 @@
   (address 0 :type integer))
 
 (defun %qml-name (name)
-  (if (find name '("QQuickView" "Item") :test 'string=)
-      name
-      (subseq name
-              (let ((start 0))
-                (dolist (q '("QDeclarativeGeo" "QDeclarative" "QQuick" "QQml" "Qml"))
-                  (when (x:starts-with q name)
-                    (setf start (length q))
-                    (return)))
-                start)
-              (or (search "Item" name)
-                  (position #\_ name)))))
+  (cond ((string= "QQuickView" name)
+         name)
+        ((string= "QQuickItem" name)
+         "Item")
+        (t
+         (subseq name
+                 (let ((start 0))
+                   (dolist (q '("QDeclarativeGeo" "QDeclarative" "QQuick" "QQml" "Qml"))
+                     (when (x:starts-with q name)
+                       (setf start (length q))
+                       (return)))
+                   start)
+                 (or (search "Item" name)
+                     (position #\_ name))))))
 
 (defmethod print-object ((object qt-object) s)
   (print-unreadable-object (object s :type nil :identity nil)