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
This commit is contained in:
JTL
2018-12-28 15:32:25 -08:00
committed by Jonathan White
parent b1ff346f63
commit dd5665c656
13 changed files with 83 additions and 54 deletions

View File

@@ -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