diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-10 23:50:51 -0600 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-10 23:50:51 -0600 |
| commit | 33cae53665ef2a1a0db8cf664faca0faf08770f6 (patch) | |
| tree | 63bd31d7f0a64693b124e8f0858f3423184ea635 /main.cpp | |
| parent | de9bdceec73a7228c44e189e4bc141c721488586 (diff) | |
Merge AOV 2.5.1 into mainline
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5,9 +5,9 @@ #include "networkmanager.h" #include "lobby.h" #include "courtroom.h" - +#include <QPluginLoader> #include <QDebug> - +Q_IMPORT_PLUGIN(ApngImagePlugin); int main(int argc, char *argv[]) { #if QT_VERSION > QT_VERSION_CHECK(5, 6, 0) @@ -16,10 +16,10 @@ int main(int argc, char *argv[]) // packages up to Qt 5.6, so this is conditional. AOApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif + AOApplication main_app(argc, argv); main_app.construct_lobby(); main_app.net_manager->connect_to_master(); main_app.w_lobby->show(); - return main_app.exec(); } |
