mirror of
https://gitlab.com/eql/EQL5.git
synced 2025-12-06 02:30:31 -08:00
change 'linux' to 'unix' in *.pro files, small revisions
This commit is contained in:
parent
82c209a469
commit
0bf4fbaf2e
14 changed files with 18 additions and 17 deletions
|
|
@ -52,10 +52,10 @@ Item {
|
||||||
font.pixelSize: 32
|
font.pixelSize: 32
|
||||||
|
|
||||||
NumberAnimation on rotation {
|
NumberAnimation on rotation {
|
||||||
from: 0; to: 360;
|
from: 0; to: 360
|
||||||
easing.type: Easing.InOutElastic;
|
easing.type: Easing.InOutElastic
|
||||||
duration: 3000;
|
duration: 3000
|
||||||
loops: Animation.Infinite;
|
loops: Animation.Infinite
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
(defsystem :my-app
|
(defsystem :my-app
|
||||||
:serial t
|
:serial t
|
||||||
:depends-on (:alexandria)
|
;;:depends-on (:alexandria)
|
||||||
:components ((:file "package")
|
:components ((:file "package")
|
||||||
(:file "lisp/my")))
|
(:file "lisp/my")))
|
||||||
|
|
|
||||||
|
|
@ -3037,7 +3037,6 @@ QVariantList lispToQVariantList(cl_object l_list) {
|
||||||
// converts (nested) Lisp lists to (nested) QVariant lists
|
// converts (nested) Lisp lists to (nested) QVariant lists
|
||||||
QVariantList l;
|
QVariantList l;
|
||||||
if(ECL_LISTP(l_list)) {
|
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)) {
|
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);
|
cl_object l_el = cl_car(l_do_list);
|
||||||
l << lispToQVariant(l_el); }}
|
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'
|
// direct, fast JS calls, see 'lisp/qml.lisp'
|
||||||
// max. 10 arguments
|
// max. 10 arguments
|
||||||
// supported argument types: T, NIL, INTEGER, FLOAT, STRING, (nested) LIST of mentioned 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;
|
ecl_process_env()->nvalues = 1;
|
||||||
const int MAX = 10;
|
const int MAX = 10;
|
||||||
QVariant arg[MAX];
|
QVariant arg[MAX];
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ MOC_DIR = ./tmp/
|
||||||
|
|
||||||
QMAKE_RPATHDIR = /usr/lib
|
QMAKE_RPATHDIR = /usr/lib
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = /usr/bin
|
target.path = /usr/bin
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
include.files = eql5/*
|
include.files = eql5/*
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
include.path = /usr/include/eql5
|
include.path = /usr/include/eql5
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/help/
|
||||||
MOC_DIR = ./tmp/help/
|
MOC_DIR = ./tmp/help/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/multimedia/
|
||||||
MOC_DIR = ./tmp/multimedia/
|
MOC_DIR = ./tmp/multimedia/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/network/
|
||||||
MOC_DIR = ./tmp/network/
|
MOC_DIR = ./tmp/network/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/quick/
|
||||||
MOC_DIR = ./tmp/quick/
|
MOC_DIR = ./tmp/quick/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/sql/
|
||||||
MOC_DIR = ./tmp/sql/
|
MOC_DIR = ./tmp/sql/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/svg/
|
||||||
MOC_DIR = ./tmp/svg/
|
MOC_DIR = ./tmp/svg/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ OBJECTS_DIR = ./tmp/webengine/
|
||||||
MOC_DIR = ./tmp/webengine/
|
MOC_DIR = ./tmp/webengine/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ MOC_DIR = ./tmp/webkit/
|
||||||
VERSION = $$(EQL_VERSION)
|
VERSION = $$(EQL_VERSION)
|
||||||
macx:QT += network
|
macx:QT += network
|
||||||
|
|
||||||
linux {
|
unix {
|
||||||
target.path = $$[QT_INSTALL_LIBS]
|
target.path = $$[QT_INSTALL_LIBS]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue