sfos/eql5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfixes' into 'master'

Browse source 
Pass argc/argv to Qt before passing it to ecl and fixes in webkit module

See merge request eql/EQL5!4
This commit is contained in:
P. Ruetz 2021-03-25 08:28:13 +00:00
commit 440089d90d
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gen/webkit/_ini.cpp
View file

@ -26,7 +26,7 @@ NumList LWebElementCollection::overrideIds = NumList();
NumList LWebHitTestResult::overrideIds = NumList();
NumList LWebSecurityOrigin::overrideIds = NumList();
void webkit_ini() {
void* webkit_ini() {
static bool _ = false; if(_) return 0; _ = true;
ModuleWebkit* module = new ModuleWebkit;
module->ini2();
@ -90,7 +90,7 @@ const QMetaObject* ModuleWebkit::staticMetaObject(int n) {
case 278: m = &QWebView::staticMetaObject; break; }
return m; }
void deleteNObject(int n, void* p, int gc) {
void ModuleWebkit::deleteNObject(int n, void* p, int gc) {
switch(n) {
case 264: if(gc) delete (QWebDatabase*)p; else delete (LWebDatabase*)p; break;
case 265: if(gc) delete (QWebElement*)p; else delete (LWebElement*)p; break;

2
src/gen/webkit/_ini2.h
View file

@ -5,4 +5,6 @@
#include <eql5/eql.h>
#include <QtWebKit>
Q_DECLARE_METATYPE(QList<QWebPluginFactory::Plugin>)
#endif

5
src/main.cpp
View file

@ -55,10 +55,11 @@ int catch_all_qexec() {
int main(int argc, char** argv) {
EQL::ini(argc, argv); // best initialized here
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); // for Qt WebEngine
QApplication qapp(argc, argv);
EQL::ini(argc, argv); // best initialized here
QStringList args(QCoreApplication::arguments());
if(args.contains("-h") || (args.contains("--help"))) {
std::cout << "Usage: eql5 [file] [-qtpl] [-qgui] [-quic file.ui [:ui-package] [:maximized]] [-slime] [-norc] [-debug-on-error]" << std::endl;