summaryrefslogtreecommitdiffstats
path: root/application/main.cpp
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
committerThomas Groman <tgroman@nuegia.net>2019-09-19 00:41:48 -0700
commit32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch)
tree7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /application/main.cpp
parent5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff)
downloadMultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz
MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip
merged from 0.6.7 codebase
Diffstat (limited to 'application/main.cpp')
-rw-r--r--application/main.cpp63
1 files changed, 32 insertions, 31 deletions
diff --git a/application/main.cpp b/application/main.cpp
index 2f90f2b3..c871bf1b 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -16,46 +16,47 @@
int main(int argc, char *argv[])
{
#ifdef BREAK_INFINITE_LOOP
- while(true)
- {
- std::this_thread::sleep_for(std::chrono::milliseconds(250));
- }
+ while(true)
+ {
+ std::this_thread::sleep_for(std::chrono::milliseconds(250));
+ }
#endif
#ifdef BREAK_EXCEPTION
- throw 42;
+ throw 42;
#endif
#ifdef BREAK_RETURN
- return 42;
+ return 42;
#endif
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
- QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
- // initialize Qt
- MultiMC app(argc, argv);
+ // initialize Qt
+ MultiMC app(argc, argv);
- switch (app.status())
- {
- case MultiMC::StartingUp:
- case MultiMC::Initialized:
- {
- Q_INIT_RESOURCE(multimc);
- Q_INIT_RESOURCE(backgrounds);
- Q_INIT_RESOURCE(assets);
+ switch (app.status())
+ {
+ case MultiMC::StartingUp:
+ case MultiMC::Initialized:
+ {
+ Q_INIT_RESOURCE(multimc);
+ Q_INIT_RESOURCE(backgrounds);
+ Q_INIT_RESOURCE(assets);
- Q_INIT_RESOURCE(pe_dark);
- Q_INIT_RESOURCE(pe_light);
- Q_INIT_RESOURCE(pe_blue);
- Q_INIT_RESOURCE(pe_colored);
- Q_INIT_RESOURCE(OSX);
- Q_INIT_RESOURCE(iOS);
- Q_INIT_RESOURCE(flat);
- return app.exec();
- }
- case MultiMC::Failed:
- return 1;
- case MultiMC::Succeeded:
- return 0;
- }
+ Q_INIT_RESOURCE(pe_dark);
+ Q_INIT_RESOURCE(pe_light);
+ Q_INIT_RESOURCE(pe_blue);
+ Q_INIT_RESOURCE(pe_colored);
+ Q_INIT_RESOURCE(OSX);
+ Q_INIT_RESOURCE(iOS);
+ Q_INIT_RESOURCE(flat);
+ return app.exec();
+ }
+ case MultiMC::Failed:
+ return 1;
+ case MultiMC::Succeeded:
+ return 0;
+ }
}