diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-09 08:51:25 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-09 15:00:58 +0200 |
| commit | 6bc3fe31a3f354afc7be870a4a2d375ab6c746b6 (patch) | |
| tree | 39b439b16cb872b3d982a6083a546456001d0f8e /gui/main.cpp | |
| parent | cc6fc6577940df89c57db08743b181291c2a4b43 (diff) | |
add support for migrations
They're run from the UI thread so can even be interactive.
Diffstat (limited to 'gui/main.cpp')
| -rw-r--r-- | gui/main.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gui/main.cpp b/gui/main.cpp index e452b781..7ac822dc 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -7,6 +7,7 @@ # include <QString> #endif +#include "migration/migration.hpp" #include "main-window.hpp" #include "options/options.hpp" #include "compat/win32-com.hpp" @@ -23,8 +24,7 @@ using namespace options; void set_qt_style() { #if defined(_WIN32) || defined(__APPLE__) - // qt5 designer-made controls look like shit on 'doze -sh 20140921 - // also our OSX look leaves a lot to be desired -sh 20150726 + // our layouts on OSX make some control wrongly sized -sh 20160908 { const QStringList preferred { "fusion", "windowsvista", "macintosh" }; for (const auto& style_name : preferred) @@ -176,10 +176,7 @@ main(int argc, char** argv) #ifdef _MSC_VER int WINAPI -WinMain (struct HINSTANCE__ *hInstance, - struct HINSTANCE__ *hPrevInstance, - char *lpszCmdLine, - int nCmdShow) +WinMain (struct HINSTANCE__*, struct HINSTANCE__*, char*, int) { return main (__argc, __argv); } |