From 1689096967ea7f103bd0be994068abc395995807 Mon Sep 17 00:00:00 2001 From: danteruiz Date: Wed, 28 Aug 2019 14:24:13 -0700 Subject: [PATCH] working on launcher app --- launchers/qt/CMakeLists.txt | 2 ++ launchers/qt/src/Launcher.cpp | 7 +++++++ launchers/qt/src/Launcher.h | 7 +++++++ launchers/qt/src/main.cpp | 7 ++++--- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 launchers/qt/src/Launcher.cpp create mode 100644 launchers/qt/src/Launcher.h diff --git a/launchers/qt/CMakeLists.txt b/launchers/qt/CMakeLists.txt index 2f5e9131c1..e70b001cbe 100644 --- a/launchers/qt/CMakeLists.txt +++ b/launchers/qt/CMakeLists.txt @@ -31,6 +31,8 @@ endforeach() set(src_files src/main.cpp + src/Launcher.h + src/Launcher.cpp src/LauncherWindow.h src/LauncherWindow.cpp) diff --git a/launchers/qt/src/Launcher.cpp b/launchers/qt/src/Launcher.cpp new file mode 100644 index 0000000000..24a020dc92 --- /dev/null +++ b/launchers/qt/src/Launcher.cpp @@ -0,0 +1,7 @@ +#include "Launcher.h" + +Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) { +} + +Launcher::~Launcher() { +} diff --git a/launchers/qt/src/Launcher.h b/launchers/qt/src/Launcher.h new file mode 100644 index 0000000000..7a049b0a1d --- /dev/null +++ b/launchers/qt/src/Launcher.h @@ -0,0 +1,7 @@ +#include + +class Launcher : public QGuiApplication { +public: + Launcher(int& argc, char** argv); + ~Launcher(); +}; diff --git a/launchers/qt/src/main.cpp b/launchers/qt/src/main.cpp index 1a0d9339c0..ac83951056 100644 --- a/launchers/qt/src/main.cpp +++ b/launchers/qt/src/main.cpp @@ -1,11 +1,12 @@ #include -#include + #include #include #include #include #include "LauncherWindow.h" +#include "Launcher.h" //Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin); Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); Q_IMPORT_PLUGIN(QtQuick2Plugin); @@ -17,7 +18,7 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setOrganizationName(name); - QGuiApplication app(argc, argv); + Launcher launcher(argc, argv); QString resourceBinaryLocation = QGuiApplication::applicationDirPath() + "/resources.rcc"; QResource::registerResource(resourceBinaryLocation); @@ -30,5 +31,5 @@ int main(int argc, char *argv[]) } launcherWindow.setResizeMode(QQuickView::SizeRootObjectToView); launcherWindow.show(); - return app.exec(); + return launcher.exec(); }