From caae249b4f68c7b136b6a4e077c8839bf7f7d2c2 Mon Sep 17 00:00:00 2001 From: polos Date: Mon, 5 Feb 2018 12:10:32 +0100 Subject: [PATCH] small revisions --- src/ecl_fun.cpp | 1 + src/eql5.pro | 4 ++-- src/eql_exe.pro | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ecl_fun.cpp b/src/ecl_fun.cpp index fe49b5c..444338d 100644 --- a/src/ecl_fun.cpp +++ b/src/ecl_fun.cpp @@ -2963,6 +2963,7 @@ cl_object qrun_in_gui_thread2(cl_object l_function_or_closure, cl_object l_block /// alias: qrun /// Runs function in GUI thread while (by default) blocking the calling thread (if called from main thread, function will simply be called directly).
This is needed to run GUI code from ECL threads other than the main thread.
Returns T on success.

There are 2 reasons to always wrap any EQL function like this, if called from another ECL thread:See also macro qrun*. /// (qrun 'update-view-data) + ecl_process_env()->nvalues = 1; if(l_function_or_closure != Cnil) { QObject o; if(o.thread() == QApplication::instance()->thread()) { diff --git a/src/eql5.pro b/src/eql5.pro index 6948fcb..1624402 100644 --- a/src/eql5.pro +++ b/src/eql5.pro @@ -7,8 +7,8 @@ SUBDIRS = help \ quick \ sql \ svg \ - # webengine \ - webkit + webengine \ + # webkit # ----------------------------------------------------- TEMPLATE = subdirs diff --git a/src/eql_exe.pro b/src/eql_exe.pro index 83592c4..15198d0 100644 --- a/src/eql_exe.pro +++ b/src/eql_exe.pro @@ -1,7 +1,7 @@ QT += widgets printsupport uitools TEMPLATE = app CONFIG += no_keywords release -INCLUDEPATH += ../src /usr/local/include +INCLUDEPATH += /usr/local/include LIBS += -lecl -leql5 -L.. -L/usr/local/lib TARGET = eql5 DESTDIR = ../