From 0bf4fbaf2e231a30a0173640c3bd478e6ea6ad7a Mon Sep 17 00:00:00 2001 From: "pls.153" Date: Thu, 17 Feb 2022 11:39:25 +0100 Subject: [PATCH] change 'linux' to 'unix' in *.pro files, small revisions --- examples/M-modules/quick/qml-lisp/qml/example.qml | 8 ++++---- my_app/my-app.asd | 2 +- src/ecl_fun.cpp | 3 ++- src/eql5.pro | 2 +- src/eql_exe.pro | 2 +- src/eql_lib.pro | 2 +- src/module_help.pro | 2 +- src/module_multimedia.pro | 2 +- src/module_network.pro | 2 +- src/module_quick.pro | 2 +- src/module_sql.pro | 2 +- src/module_svg.pro | 2 +- src/module_webengine.pro | 2 +- src/module_webkit.pro | 2 +- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/examples/M-modules/quick/qml-lisp/qml/example.qml b/examples/M-modules/quick/qml-lisp/qml/example.qml index 0837608..7da1cd0 100644 --- a/examples/M-modules/quick/qml-lisp/qml/example.qml +++ b/examples/M-modules/quick/qml-lisp/qml/example.qml @@ -52,10 +52,10 @@ Item { font.pixelSize: 32 NumberAnimation on rotation { - from: 0; to: 360; - easing.type: Easing.InOutElastic; - duration: 3000; - loops: Animation.Infinite; + from: 0; to: 360 + easing.type: Easing.InOutElastic + duration: 3000 + loops: Animation.Infinite } } } diff --git a/my_app/my-app.asd b/my_app/my-app.asd index 0980240..c024197 100644 --- a/my_app/my-app.asd +++ b/my_app/my-app.asd @@ -1,5 +1,5 @@ (defsystem :my-app :serial t - :depends-on (:alexandria) + ;;:depends-on (:alexandria) :components ((:file "package") (:file "lisp/my"))) diff --git a/src/ecl_fun.cpp b/src/ecl_fun.cpp index f731489..0009edd 100644 --- a/src/ecl_fun.cpp +++ b/src/ecl_fun.cpp @@ -3037,7 +3037,6 @@ QVariantList lispToQVariantList(cl_object l_list) { // converts (nested) Lisp lists to (nested) QVariant lists QVariantList l; if(ECL_LISTP(l_list)) { - cl_object l_do_list = l_list; for(cl_object l_do_list = l_list; l_do_list != ECL_NIL; l_do_list = cl_cdr(l_do_list)) { cl_object l_el = cl_car(l_do_list); l << lispToQVariant(l_el); }} @@ -3047,6 +3046,8 @@ cl_object qjs_call(cl_object l_item, cl_object l_name, cl_object l_args) { // direct, fast JS calls, see 'lisp/qml.lisp' // max. 10 arguments // supported argument types: T, NIL, INTEGER, FLOAT, STRING, (nested) LIST of mentioned arguments + // + // N.B. does not support default arguments in JS ecl_process_env()->nvalues = 1; const int MAX = 10; QVariant arg[MAX]; diff --git a/src/eql5.pro b/src/eql5.pro index 114636a..50db7f4 100644 --- a/src/eql5.pro +++ b/src/eql5.pro @@ -10,7 +10,7 @@ SUBDIRS = help \ sql \ svg \ webengine \ - # webkit + #webkit # ----------------------------------------------------- sailfish { diff --git a/src/eql_exe.pro b/src/eql_exe.pro index a0ced69..6e51d3c 100644 --- a/src/eql_exe.pro +++ b/src/eql_exe.pro @@ -10,7 +10,7 @@ MOC_DIR = ./tmp/ QMAKE_RPATHDIR = /usr/lib -linux { +unix { target.path = /usr/bin } diff --git a/src/eql_lib.pro b/src/eql_lib.pro index 6c63eb7..f8d2e58 100644 --- a/src/eql_lib.pro +++ b/src/eql_lib.pro @@ -19,7 +19,7 @@ VERSION = $$(EQL_VERSION) include.files = eql5/* -linux { +unix { include.path = /usr/include/eql5 target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_help.pro b/src/module_help.pro index 319f97b..72273de 100644 --- a/src/module_help.pro +++ b/src/module_help.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/help/ MOC_DIR = ./tmp/help/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_multimedia.pro b/src/module_multimedia.pro index 7f0465c..eea396e 100644 --- a/src/module_multimedia.pro +++ b/src/module_multimedia.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/multimedia/ MOC_DIR = ./tmp/multimedia/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_network.pro b/src/module_network.pro index e95e9d1..4bca78f 100644 --- a/src/module_network.pro +++ b/src/module_network.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/network/ MOC_DIR = ./tmp/network/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_quick.pro b/src/module_quick.pro index cb13a49..be2b003 100644 --- a/src/module_quick.pro +++ b/src/module_quick.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/quick/ MOC_DIR = ./tmp/quick/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_sql.pro b/src/module_sql.pro index cc1250f..a58ae76 100644 --- a/src/module_sql.pro +++ b/src/module_sql.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/sql/ MOC_DIR = ./tmp/sql/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_svg.pro b/src/module_svg.pro index 55cf696..7df2572 100644 --- a/src/module_svg.pro +++ b/src/module_svg.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/svg/ MOC_DIR = ./tmp/svg/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_webengine.pro b/src/module_webengine.pro index 6fbd155..076a30c 100644 --- a/src/module_webengine.pro +++ b/src/module_webengine.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/webengine/ MOC_DIR = ./tmp/webengine/ VERSION = $$(EQL_VERSION) -linux { +unix { target.path = $$[QT_INSTALL_LIBS] } diff --git a/src/module_webkit.pro b/src/module_webkit.pro index 9331ef4..7030965 100644 --- a/src/module_webkit.pro +++ b/src/module_webkit.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/webkit/ VERSION = $$(EQL_VERSION) macx:QT += network -linux { +unix { target.path = $$[QT_INSTALL_LIBS] }