From 936d5631285066d3f0228b8a972eb97a6ced5ddb Mon Sep 17 00:00:00 2001 From: "pls.153" Date: Mon, 14 Aug 2023 13:52:55 +0200 Subject: [PATCH] revision --- src/cpp/main.cpp | 13 +++++-------- src/cpp/main.h | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index e01f470..53ebcf8 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char* argv[]) { #ifdef INI_WEBVIEW QtWebView::initialize(); #endif - EventFilterApp app(argc, argv); + GuiApplication app(argc, argv); app.setApplicationName(QFileInfo(app.applicationFilePath()).baseName()); QStringList arguments(QCoreApplication::arguments()); @@ -149,13 +149,10 @@ int main(int argc, char* argv[]) { if (arguments.contains("-norc")) { arguments.removeAll("-norc"); } else { -#if (defined Q_OS_ANDROID) || (defined Q_OS_IOS) - // nothing -#else - #ifndef DESKTOP_APP - LQML::eval("(x:when-it (probe-file \"~/.eclrc\")" - " (load x:it))"); - #endif +#if (!defined Q_OS_ANDROID) && (!defined Q_OS_IOS) && (!defined DESKTOP_APP) +qDebug() << "LOADING ECLRC"; + LQML::eval("(x:when-it (probe-file \"~/.eclrc\")" + " (load x:it))"); #endif } diff --git a/src/cpp/main.h b/src/cpp/main.h index dd202f8..371c1a8 100644 --- a/src/cpp/main.h +++ b/src/cpp/main.h @@ -26,10 +26,10 @@ public: Q_INVOKABLE void clearCache() { clearComponentCache(); } }; -class EventFilterApp : public QGuiApplication { +class GuiApplication : public QGuiApplication { Q_OBJECT public: - EventFilterApp(int& argc, char* argv[]) : QGuiApplication(argc, argv) { + GuiApplication(int& argc, char* argv[]) : QGuiApplication(argc, argv) { #if (defined Q_OS_IOS) && (defined DISABLE_SMART_QUOTES) installEventFilter(this); #endif