Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJTL <jtl999@users.noreply.github.com>2018-12-29 02:32:25 +0300
committerJonathan White <support@dmapps.us>2018-12-29 02:32:25 +0300
commitdd5665c6563f6185532c4dc76896f4220fd3c8e3 (patch)
treecae25393140d0d64db268daafefb518a0288afc7 /src/core/Bootstrap.cpp
parentb1ff346f6311936a342397eaaca262a6f08e19c7 (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/Bootstrap.cpp')
-rw-r--r--src/core/Bootstrap.cpp17
1 files changed, 13 insertions, 4 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