dsit: Compilable WASM build

This commit makes it possible to compile QPrompt for WASM.  It removes
the KCoreAddons dependency, leaving a gap, and depends on a single
tweak to Kirigami.  The following compiler flags must also be set:
-DWASM:BOOL=ON
-DKF_IGNORE_PLATFORM_CHECK:BOOL=ON
-DKCOREADDONS_USE_QML:BOOL=OFF
-DBUILD_SHARED_LIBS:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DUSE_DBUS:BOOL=OFF

Doesn't work with single-threaded WebAssembly, only multi-threaded.
Resulting build loads in Firefox but fails to run due to static build
being unable to locate KirigamiPlugin.  This is the same bug that
afflicts static MacOS builds, and probably all static builds but
Android.

The changes made here not only bring the WASM build closer to fruition,
but also Android and iOS builds as well.

Author: Cuperino

CMakeLists.txt

@@ -35,6 +35,9 @@ project(qprompt
     HOMEPAGE_URL "https://qprompt.app/"
     LANGUAGES CXX)
 
+set(WASM ON)
+set(KF_IGNORE_PLATFORM_CHECK ON)
+
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to create code from Qt designer ui files
@@ -138,43 +141,48 @@ find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONEN
     LinguistTools
 )
 
-if (ANDROID OR IOS OR WASM)
+if(ANDROID OR IOS OR WASM)
     set(BUILD_SHARED_LIBS OFF)
 endif()
 
-if (WIN32 OR APPLE OR WASM)
+if(WIN32 OR APPLE OR WASM)
     set(BUILD_TESTING OFF)
-    FetchContent_Declare(
-      CoreAddons
-      GIT_REPOSITORY "${CMAKE_SOURCE_DIR}/3rdparty/kcoreaddons"
-      GIT_TAG        "v${KF_PREFFERED_VERSION}"
-      SOURCE_DIR submodules/kcoreaddons
-    )
+    if(NOT WASM)
+        FetchContent_Declare(
+          CoreAddons
+          GIT_REPOSITORY "${CMAKE_SOURCE_DIR}/3rdparty/kcoreaddons"
+          GIT_TAG        "v${KF_PREFFERED_VERSION}"
+          SOURCE_DIR submodules/kcoreaddons
+        )
+        FetchContent_MakeAvailable(CoreAddons)
+    endif()
     FetchContent_Declare(
       Kirigami
       GIT_REPOSITORY "${CMAKE_SOURCE_DIR}/3rdparty/kirigami"
       GIT_TAG        "v${KF_PREFFERED_VERSION}"
       SOURCE_DIR submodules/kirigami
     )
-    FetchContent_MakeAvailable(CoreAddons Kirigami)
+    FetchContent_MakeAvailable(Kirigami)
 else()
     find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS
         Kirigami
         CoreAddons
     )
 endif()
 
-if(NOT BSD)
-    set(BUILD_SHARED_LIBS ON)
-    FetchContent_Declare(
-      QHotkey
-      GIT_REPOSITORY "${CMAKE_SOURCE_DIR}/3rdparty/QHotkey"
-      GIT_TAG        "1231c4cc9649ec0132d939cb7e139a82b8edeca0"
-      SOURCE_DIR submodules/QHotkey
-    )
-    FetchContent_MakeAvailable(QHotkey)
-else()
-    find_package(QHotkey)
+if(NOT ANDROID AND NOT IOS AND NOT WASM)
+    if(NOT BSD)
+        set(BUILD_SHARED_LIBS ON)
+        FetchContent_Declare(
+          QHotkey
+          GIT_REPOSITORY "${CMAKE_SOURCE_DIR}/3rdparty/QHotkey"
+          GIT_TAG        "1231c4cc9649ec0132d939cb7e139a82b8edeca0"
+          SOURCE_DIR submodules/QHotkey
+        )
+        FetchContent_MakeAvailable(QHotkey)
+    else()
+        find_package(QHotkey)
+    endif()
 endif()
 # Desktop only dependencies
 if(NOT ANDROID AND NOT IOS AND NOT WASM)
@@ -356,7 +364,9 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     include(CPack)
 endif()
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) # INCLUDE_QUIET_PACKAGES
+if(NOT WASM)
+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) # INCLUDE_QUIET_PACKAGES
+endif()
 
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})

src/CMakeLists.txt

@@ -26,18 +26,24 @@ endif()
 
 qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES ar cs de es fi fr he it ja ko nl oc pl pt_BR pt_PT ru tr uk zh)
 
-qt_add_executable(${PROJECT_NAME}
-    main.cpp
-    systemfontchooserdialog.h
-    systemfontchooserdialog.cpp
-)
+if (ANDROID OR IOS OR WASM)
+    qt_add_executable(${PROJECT_NAME}
+        main.cpp
+    )
+else()
+    qt_add_executable(${PROJECT_NAME}
+        main.cpp
+        systemfontchooserdialog.h
+        systemfontchooserdialog.cpp
+    )
+endif()
 if (NOT ANDROID)
     qt_wrap_ui(${PROJECT_NAME}
         qt/systemfontchooserdialog.ui
     )
 endif()
 
-if (NOT ANDROID)
+if (NOT ANDROID AND NOT WASM)
     set(ICONS_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/icons/hicolor)
     set(RASTER_ICONS
         ${ICONS_FOLDER}/16-apps-com.cuperino.qprompt.png
@@ -328,11 +334,7 @@ qt_add_translations(${PROJECT_NAME} SOURCE_TARGETS ${PROJECT_NAME}
 )
 
 # Libraries
-if (ANDROID OR IOS OR WASM)
-    if (WASM)
-        target_compile_options(${PROJECT_NAME} PRIVATE -oz -flto)
-        target_link_options(${PROJECT_NAME} PRIVATE -flto)
-    endif()
+if (ANDROID OR IOS)
     target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt${QT_VERSION_MAJOR}::Core
         Qt${QT_VERSION_MAJOR}::Quick
@@ -344,6 +346,19 @@ if (ANDROID OR IOS OR WASM)
         KF${QT_VERSION_MAJOR}::CoreAddons
         KF${QT_VERSION_MAJOR}::Kirigami
     )
+elseif (WASM)
+    target_compile_options(${PROJECT_NAME} PRIVATE -O3 -flto -sDISABLE_EXCEPTION_THROWING=0 -sDISABLE_EXCEPTION_CATCHING=0)
+    target_link_options(${PROJECT_NAME} PRIVATE -flto -fno-except -sASYNCIFY -Os -sDISABLE_EXCEPTION_THROWING=0 -sDISABLE_EXCEPTION_CATCHING=0)
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        Qt${QT_VERSION_MAJOR}::Core
+        Qt${QT_VERSION_MAJOR}::Quick
+        Qt${QT_VERSION_MAJOR}::Svg
+        Qt${QT_VERSION_MAJOR}::Gui
+        Qt${QT_VERSION_MAJOR}::Qml
+        Qt${QT_VERSION_MAJOR}::QuickControls2
+        Qt${QT_VERSION_MAJOR}::Network
+        KF${QT_VERSION_MAJOR}::Kirigami
+    )
 elseif(HAIKU)
     target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt${QT_VERSION_MAJOR}::Core

src/documenthandler.cpp

@@ -122,16 +122,21 @@ DocumentHandler::DocumentHandler(QObject *parent)
     _fileSystemWatcher = new QFileSystemWatcher();
     pdf_importer = QString::fromUtf8("TextExtraction");
 
-    m_fontDialog = new SystemFontChooserDialog();
     m_network = new QNetworkAccessManager(this);
     m_cache = new QTemporaryFile(this);
-    connect(m_fontDialog, &SystemFontChooserDialog::fontFamilyChanged, this, &DocumentHandler::setFontFamily);
     connect(m_network, &QNetworkAccessManager::finished, this, &DocumentHandler::loadFromNetworkFinihed);
+
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
+    m_fontDialog = new SystemFontChooserDialog();
+    connect(m_fontDialog, &SystemFontChooserDialog::fontFamilyChanged, this, &DocumentHandler::setFontFamily);
+#endif
 }
 
 DocumentHandler::~DocumentHandler()
 {
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
     delete m_fontDialog;
+#endif
 }
 
 QQuickTextDocument *DocumentHandler::document() const
@@ -417,6 +422,7 @@ void DocumentHandler::setKeyMarker(QString keyCodeString = QString::fromUtf8("")
     Q_EMIT markerChanged();
 }
 
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
 bool DocumentHandler::showFontDialog()
 {
     QTextCursor cursor = textCursor();
@@ -436,6 +442,7 @@ bool DocumentHandler::showFontDialog()
     m_fontDialog->show(fontFamily(), text);
     return false;
 }
+#endif
 
 QString DocumentHandler::getMarkerKey()
 {
@@ -610,6 +617,7 @@ void DocumentHandler::load(const QUrl &fileUrl)
 #endif
                 // File formats imported using external software
                 else {
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
                     ImportFormat type = NONE;
                     if (mime.inherits(QString::fromUtf8("application/pdf")))
                         type = PDF;
@@ -649,6 +657,7 @@ void DocumentHandler::load(const QUrl &fileUrl)
                     }
                     // Read as raw or text file
                     else {
+#endif
                         // Interpret RAW data using Qt's auto detection
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
                         // I doubt that this is a proper conversion. Needs proper testing.
@@ -657,7 +666,9 @@ void DocumentHandler::load(const QUrl &fileUrl)
                         QTextCodec *codec = QTextCodec::codecForName("utf-8");
                         updateContents(codec->toUnicode(data));
 #endif
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
                     }
+#endif
                 }
                 doc->setModified(false);
             }
@@ -685,6 +696,7 @@ void DocumentHandler::load(const QUrl &fileUrl)
     Q_EMIT fileUrlChanged();
 }
 
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
 QString DocumentHandler::import(const QString &fileName, ImportFormat type)
 {
     QString program = QString::fromUtf8("");
@@ -743,6 +755,7 @@ QString DocumentHandler::import(const QString &fileName, ImportFormat type)
     //     return filterHtml(html, true);
     return filterHtml(html, false);
 }
+#endif
 
 void DocumentHandler::updateContents(const QString &text, Qt::TextFormat format) {
     QTextCursor cursor = textCursor();

src/documenthandler.h

@@ -80,7 +80,9 @@
 #include <QUrl>
 
 #include "markersmodel.h"
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
 #include "systemfontchooserdialog.h"
+#endif
 #include <QFont>
 #include <QQuickTextDocument>
 #include <QTextCursor>
@@ -211,7 +213,9 @@ class DocumentHandler : public QObject
 
     Q_INVOKABLE bool preventSleep(bool prevent);
 
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
     Q_INVOKABLE bool showFontDialog();
+#endif
 
     Q_INVOKABLE void loadFromNetwork(const QUrl &url);
 
@@ -264,7 +268,9 @@ public Q_SLOTS:
 
     enum ImportFormat { NONE, PDF, ODT, DOCX, DOC, RTF, ABW, EPUB, MOBI, AZW, PAGES, PAGESX };
     void updateContents(const QString &text, Qt::TextFormat format);
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
     QString import(const QString &fileName, ImportFormat);
+#endif
 
     QQuickTextDocument *m_document;
 
@@ -277,7 +283,9 @@ public Q_SLOTS:
     MarkersModel *_markersModel;
     QFileSystemWatcher *_fileSystemWatcher;
 
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
     SystemFontChooserDialog *m_fontDialog;
+#endif
     QFont m_font;
     QUrl m_fileUrl;
     QString pdf_importer;

src/main.cpp

@@ -44,7 +44,9 @@
 #endif
 // #include <KLocalizedContext>
 // #include <KLocalizedString>
+#ifndef Q_OS_WASM
 #include <kaboutdata.h>
+#endif
 
 #if defined(KF6Crash_FOUND)
 #include <KCrash>
@@ -132,6 +134,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QString copyrightYear = QString::number(currentYear);
     QString copyrightStatement1 = QStringLiteral("© 2020 Javier O. Cordero Pérez");
     QString copyrightStatement2 = QStringLiteral("© 2020-2025 Javier O. Cordero Pérez"); // , copyrightYear);
+#ifndef Q_OS_WASM
     KAboutData aboutData(QLatin1String("qprompt"),
                          QLatin1String("QPrompt"),
                          QPROMPT_VERSION_STRING " (" + QString::fromUtf8(GIT_BRANCH) + "/" + QString::fromUtf8(GIT_COMMIT_HASH) + ")",
@@ -161,7 +164,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     //);
     //  Set the application metadata
     KAboutData::setApplicationData(aboutData);
-
+#endif
     // qmlRegisterType<PrompterTimer>(QPROMPT_URI + ".promptertimer", 1, 0, "PrompterTimer");
     //    qmlRegisterType<DocumentHandler>(QPROMPT_URI ".document", 1, 0, "DocumentHandler");
     //    qmlRegisterType<MarkersModel>(QPROMPT_URI ".markers", 1, 0, "MarkersModel");
@@ -172,9 +175,9 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
     //    qRegisterMetaType<Marker>();
 
-    // #ifdef Q_OS_ANDROID
-    // KirigamiPlugin::getInstance().registerTypes();
-    // #endif
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM)
+// KirigamiPlugin::getInstance().registerTypes();
+#endif
 
 #if defined(Q_OS_MACOS)
     // Enable automatic display of dialog prompts on the touchbar.
@@ -233,7 +236,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     // Un-comment to force RightToLeft Layout for debugging purposes
     // app.setLayoutDirection(Qt::RightToLeft);
 
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_QNX)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     app.setWindowIcon(QIcon(":/qt/qml/com/cuperino/qprompt/images/qprompt-logo-wireframe.png"));
 #else
     app.setWindowIcon(QIcon(":/qt/qml/com/cuperino/qprompt/images/qprompt.png"));
@@ -255,7 +258,9 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     engine.addImportPath(QStringLiteral("../Resources/qml/"));
     // Send context data from C++ to QML
     // engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
+#ifndef Q_OS_WASM
     engine.rootContext()->setContextProperty(QStringLiteral("aboutData"), QVariant::fromValue(KAboutData::applicationData()));
+#endif
     if (positionalArguments.length())
         engine.rootContext()->setContextProperty(QStringLiteral("fileToOpen"), fileToOpen);
 #if defined(Q_OS_MACOS)

src/qmlutil.hpp

@@ -33,7 +33,9 @@
 #include <QKeySequence>
 #include <QObject>
 #include <QPixmap>
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
 #include <QProcess>
+#endif
 #include <QQmlEngine>
 #include <QSettings>
 
@@ -75,7 +77,9 @@ class QmlUtil : public QObject
     }
     Q_INVOKABLE void restartApplication()
     {
+#if !(defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_WASM) || defined(Q_OS_WATCHOS))
         QProcess::startDetached(QCoreApplication::applicationFilePath(), {"-q"});
+#endif
         QCoreApplication::quit();
     }
     Q_INVOKABLE void hideCursor()