diff options
author | JTL <jtl999@users.noreply.github.com> | 2018-12-29 02:32:25 +0300 |
---|---|---|
committer | Jonathan White <support@dmapps.us> | 2018-12-29 02:32:25 +0300 |
commit | dd5665c6563f6185532c4dc76896f4220fd3c8e3 (patch) | |
tree | cae25393140d0d64db268daafefb518a0288afc7 /src/core | |
parent | b1ff346f6311936a342397eaaca262a6f08e19c7 (diff) |
Multiple macOS fixes and include keepassxc-cli in DMG (#2165)
* Fixes including keepassxc-cli when building KeePassXC dmg on Mac.
resolves #1697
* Fix Qt search path and Properties display on macOS
* Simplify packaging POST_BUILD fixups
* Various fixes to get cli to run on macos
* Correct cli tests on macOS
* Several macOS related GUI test fixes
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/Bootstrap.cpp | 17 | ||||
-rw-r--r-- | src/core/Bootstrap.h | 1 | ||||
-rw-r--r-- | src/core/Translator.cpp | 3 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp index cfef7db7b..10dd9b2d8 100644 --- a/src/core/Bootstrap.cpp +++ b/src/core/Bootstrap.cpp @@ -62,11 +62,10 @@ namespace Bootstrap } /** - * Perform early application bootstrapping such as setting up search paths, - * configuration OS security properties, and loading translators. - * A QApplication object has to be instantiated before calling this function. + * Perform early application bootstrapping that does not rely on a QApplication + * being present. */ - void bootstrapApplication() + void bootstrap() { #ifdef QT_NO_DEBUG disableCoreDumps(); @@ -74,6 +73,16 @@ namespace Bootstrap setupSearchPaths(); applyEarlyQNetworkAccessManagerWorkaround(); Translator::installTranslators(); + } + + /** + * Perform early application bootstrapping such as setting up search paths, + * configuration OS security properties, and loading translators. + * A QApplication object has to be instantiated before calling this function. + */ + void bootstrapApplication() + { + bootstrap(); MessageBox::initializeButtonDefs(); #ifdef Q_OS_MACOS diff --git a/src/core/Bootstrap.h b/src/core/Bootstrap.h index 95158fb8c..de1a4d836 100644 --- a/src/core/Bootstrap.h +++ b/src/core/Bootstrap.h @@ -22,6 +22,7 @@ namespace Bootstrap { + void bootstrap(); void bootstrapApplication(); void restoreMainWindowState(MainWindow& mainWindow); void disableCoreDumps(); diff --git a/src/core/Translator.cpp b/src/core/Translator.cpp index 595dadfa1..f64a7a44c 100644 --- a/src/core/Translator.cpp +++ b/src/core/Translator.cpp @@ -47,7 +47,8 @@ void Translator::installTranslators() #ifdef QT_DEBUG QString("%1/share/translations").arg(KEEPASSX_BINARY_DIR), #endif - filePath()->dataPath("translations")}; + filePath()->dataPath("translations") + }; bool translationsLoaded = false; for (const QString& path : paths) { |