diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-13 11:57:26 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-13 14:05:27 +0200 |
| commit | 3599a5aa4b2f201a6b227f082ad1406a235c0da2 (patch) | |
| tree | 22614f9bf76b6b52a21d5341e760eb07c503550f | |
| parent | cbd441a670a4447d607d276dc604fae8a5928e3d (diff) | |
main: fix accessing build box's hardcoded drive
| -rw-r--r-- | bin/qt.conf | 11 | ||||
| -rw-r--r-- | gui/main.cpp | 13 |
2 files changed, 16 insertions, 8 deletions
diff --git a/bin/qt.conf b/bin/qt.conf index 89808c16..38487b7a 100644 --- a/bin/qt.conf +++ b/bin/qt.conf @@ -1,2 +1,9 @@ -[Platforms]
-WindowsArguments = dpiawareness=0
\ No newline at end of file +[Platforms] +WindowsArguments = dpiawareness=0 +[Paths] +Libraries = . +LibraryExecutables = . +Binaries = . +Plugins = . +Imports = . +Translations = . diff --git a/gui/main.cpp b/gui/main.cpp index 48fe8f74..b422a374 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -143,20 +143,21 @@ main(int argc, char** argv) #endif QApplication::setAttribute(Qt::AA_X11InitThreads, true); - QTranslator t; QApplication app(argc, argv); +#ifdef _WIN32 + add_win32_path(); +#endif + + MainWindow::set_working_directory(); + #if !defined(__linux) && !defined _WIN32 // workaround QTBUG-38598 QCoreApplication::addLibraryPath("."); #endif set_qt_style(); - MainWindow::set_working_directory(); - -#ifdef _WIN32 - add_win32_path(); -#endif + QTranslator t; // QLocale::setDefault(QLocale("ru_RU")); // force i18n for testing |