mirrors/lqml
1
Fork 0
mirror of https://gitlab.com/eql/lqml.git synced 2025-12-15 14:51:14 -08:00
Code Issues Projects Releases Packages Wiki Activity

revisions

Browse source
This commit is contained in:
pls.153 2023-02-25 12:08:53 +01:00
parent c7d631697a
commit 45d6984bec
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platforms/ios/build-ecl/2-make-ecl-ios.sh
View file

@ -47,7 +47,7 @@ select_ios()
esac
# this needs to be updated when a new Xcode is released
iphoneos_version_min="11.0"
iphoneos_version_min="12.0"
export CC="clang"
export CXX="clang++"

2
platforms/ios/cross-compile.sh
View file

@ -34,7 +34,7 @@ select_ios_and_simulator()
echo "*** compiling for \"$ios_platform\" - \"$ios_sdk\" and \"$ios_platform_sim\" - \"$ios_sdk_sim\""
# this needs to be updated when a new Xcode is released
iphoneos_version_min="11.0"
iphoneos_version_min="12.0"
export CC="clang"
export CXX="clang++"

4
platforms/shared/make.lisp
View file

@ -12,6 +12,8 @@
;; optional, to be set in 'make.lisp' in your app dir
(defvar *ql-libs* nil)
(defvar *require* nil)
(defvar *build-type* nil)
(defvar *init-name* nil)
(pushnew :lqml *features*)
@ -86,6 +88,6 @@
(asdf:make-build *asdf-system*
:monolithic t
:type :static-library
:type (or *build-type* :static-library)
:move-here *library-path*
:init-name *init-name*)

6
src/cpp/ecl_ext.cpp
View file

@ -360,8 +360,8 @@ cl_object qexec2(cl_object l_milliseconds) {
/// after which QEventLoop::exit() will be called. See also QSLEEP.
ecl_process_env()->nvalues = 1;
if (l_milliseconds != ECL_NIL) {
static QTimer* timer = 0;
if (!timer) {
static QTimer* timer = nullptr;
if (timer == nullptr) {
timer = new QTimer;
LQML::eventLoop = new QEventLoop;
timer->setSingleShot(true);
@ -815,7 +815,7 @@ cl_object qapropos2(cl_object l_search, cl_object l_obj, cl_object l_no_offset)
search = toCString(l_search);
}
bool no_offset = (l_no_offset != ECL_NIL); // for QML (all instance properties)
const QMetaObject* mo = 0;
const QMetaObject* mo = nullptr;
QObject* obj = toQObjectPointer(l_obj);
if (obj != nullptr) {
mo = obj->metaObject();

4
src/cpp/qml_ext.cpp
View file

@ -31,7 +31,7 @@ QVariant Lisp::call(const QJSValue& caller_or_function,
const QJSValue& arg14,
const QJSValue& arg15,
const QJSValue& arg16) {
QObject* caller = 0;
QObject* caller = nullptr;
QString function;
QVariantList arguments;
if (caller_or_function.isQObject()) {
@ -97,7 +97,7 @@ QVariant Lisp::call(const QJSValue& caller_or_function,
QVariant Lisp::apply(const QJSValue& caller_or_function,
const QJSValue& function_or_arguments,
const QJSValue& arguments_or_undefined) {
QObject* caller = 0;
QObject* caller = nullptr;
QString function;
QVariantList arguments;
if (caller_or_function.isQObject()) {