feat(terminal): run on QGuiApplication as an application module the booster can start

main
reionwong 3 weeks ago
parent c0e28079b0
commit 8593e4a056

@ -48,14 +48,12 @@ if(BUILD_TESTING)
add_subdirectory(tests)
endif()
add_executable(${PROJECT_NAME} ${SRCS} ${RESOURCES})
target_link_libraries(${PROJECT_NAME}
cutefish_add_application(${PROJECT_NAME} SOURCES ${SRCS} ${RESOURCES})
target_link_libraries(${PROJECT_NAME}-module PRIVATE
Qt6::Core
Qt6::Qml
Qt6::Quick
Qt6::Widgets
Qt6::DBus
Cutefish::Application
)
file(GLOB TS_FILES translations/*.ts)
@ -64,8 +62,6 @@ add_custom_target(translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES})
add_dependencies(${PROJECT_NAME} translations)
install(FILES ${QM_FILES} DESTINATION /usr/share/cutefish-terminal/translations)
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION /usr/bin)
install(FILES
cutefish-terminal.desktop
DESTINATION /usr/share/applications/

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2026 Reion Wong <reionwong@gmail.com>
// SPDX-License-Identifier: GPL-3.0-or-later
#include <QApplication>
#include <QGuiApplication>
#include <QQmlApplicationEngine>
#include <QQmlComponent>
#include <QQmlContext>
@ -19,10 +19,12 @@
#include "fonts.h"
#include "windows.h"
int main(int argc, char *argv[])
int cutefish_application_main(int argc, char *argv[])
{
QApplication app(argc, argv);
Cutefish::Application::prepare();
Q_UNUSED(argc);
Q_UNUSED(argv);
QGuiApplication &app = *qGuiApp;
app.setWindowIcon(QIcon::fromTheme("terminal"));
// Everything after -e is the command and its own options, so it is split

@ -4,7 +4,7 @@
#include "processhelper.h"
#include "applicationlauncher.h"
#include <QDesktopServices>
#include <QApplication>
#include <QCoreApplication>
#include <QUrl>
#include <QDir>
#include <QFileInfo>
@ -52,7 +52,7 @@ static void callFileManager(const QString &method, const QString &path)
QStringLiteral("org.freedesktop.FileManager1"),
method);
message << QStringList { QUrl::fromLocalFile(path).toString() }
<< QString::number(QApplication::applicationPid());
<< QString::number(QCoreApplication::applicationPid());
QDBusConnection::sessionBus().asyncCall(message);
}

@ -2,8 +2,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
#include "utils.h"
#include <QApplication>
#include <QClipboard>
#include <QGuiApplication>
static Utils *SELF = nullptr;
@ -23,10 +23,10 @@ Utils::Utils(QObject *parent)
QString Utils::text() const
{
return qApp->clipboard()->text();
return QGuiApplication::clipboard()->text();
}
void Utils::setText(const QString &text)
{
qApp->clipboard()->setText(text);
QGuiApplication::clipboard()->setText(text);
}

Loading…
Cancel
Save