Add <swiftInstall>/bin to library lookup paths

Summary:
This change adds <swiftInstall>/bin to the library lookup paths.
Without, QFactoryLoader is not able to find the Qt plugins
on Mac OS since on this platform the hard coded path defaults to
'foo.app/Contents/MacOS' for app bundles.
This change also adds the installation of QtPrintSupport framework which
is a dependency from cocoa platform plugin.

ref T48

Reviewers: kbasan, msutcliffe

Reviewed By: kbasan

Subscribers: jenkins

Maniphest Tasks: T48

Differential Revision: https://dev.swift-project.org/D15
This commit is contained in:
Roland Winklmeier
2017-04-25 13:27:21 +02:00
committed by Mathew Sutcliffe
parent 9c9f3e82ae
commit a3bc5c2936
13 changed files with 55 additions and 2 deletions

View File

@@ -10,6 +10,7 @@
#include "blackcore/corefacadeconfig.h"
#include "blackgui/guiapplication.h"
#include "blackmisc/icons.h"
#include "blackmisc/directoryutils.h"
#include "swiftcore.h"
#include <stdlib.h>
@@ -25,6 +26,9 @@ using namespace BlackGui;
int main(int argc, char *argv[])
{
//! [SwiftApplicationDemo]
#ifdef Q_OS_MAC
QApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
#endif
CGuiApplication::highDpiScreenSupport();
QApplication qa(argc, argv);
Q_UNUSED(qa); // init of qa is required, but qa not used

View File

@@ -9,6 +9,7 @@
#include "blackcore/webreaderflags.h"
#include "blackgui/guiapplication.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/icons.h"
#include "swiftdata.h"
@@ -23,6 +24,9 @@ using namespace BlackGui;
int main(int argc, char *argv[])
{
#ifdef Q_OS_MAC
QApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
#endif
CGuiApplication::highDpiScreenSupport();
QApplication qa(argc, argv);
Q_UNUSED(qa);

View File

@@ -9,6 +9,7 @@
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/guiapplication.h"
#include "blackmisc/directoryutils.h"
#include "swiftguistd.h"
#include "swiftguistdapplication.h"
@@ -22,6 +23,9 @@ using namespace BlackCore;
int main(int argc, char *argv[])
{
//! [SwiftApplicationDemo]
#ifdef Q_OS_MAC
QApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
#endif
CGuiApplication::highDpiScreenSupport();
QApplication qa(argc, argv);
Q_UNUSED(qa); // application init needed

View File

@@ -11,6 +11,7 @@
#include "blackgui/guiapplication.h"
#include "blackcore/registermetadata.h"
#include "blackcore/db/databasereaderconfig.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/icons.h"
@@ -29,6 +30,9 @@ using namespace BlackCore::Db;
int main(int argc, char *argv[])
{
//! [SwiftApplicationDemo]
#ifdef Q_OS_MAC
QApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
#endif
CGuiApplication::highDpiScreenSupport();
QApplication qa(argc, argv); // needed
Q_UNUSED(qa);