Merge branch 'master' of ssh://brodbeck-online.de:60022/martin/kima2-cpp into master

This commit is contained in:
Martin Brodbeck 2020-10-15 15:49:02 +02:00
commit 9e6e2eb936

View file

@ -8,6 +8,7 @@
#include <QSettings> #include <QSettings>
#include <QSharedMemory> #include <QSharedMemory>
#include <QTranslator> #include <QTranslator>
#include <QStyleFactory>
#include <singleapplication.h> #include <singleapplication.h>
@ -25,6 +26,7 @@ int main(int argc, char* argv[])
qTranslator.load("qt_" + german.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qTranslator.load("qt_" + german.name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
QApplication::setStyle(QStyleFactory::create("Fusion"));
qTranslator.load("qt_" + german.name(), qTranslator.load("qt_" + german.name(),
QApplication::applicationDirPath() + QDir::separator() + "translations"); QApplication::applicationDirPath() + QDir::separator() + "translations");
#endif #endif