Use qt.conf to override plugin path on Mac OS

Summary:
QCoreApplication::addLibraryPath is called before QCoreApplication
was constructed and this caused the returned string to be different
depending from which working directory it was called and not always
the intended binary path.
Using qt.conf has a fixed prefix relative to the binary path
inside the application bundle and therefore is easier to be used
with a relative path.

Reviewers: kbasan, msutcliffe

Reviewed By: msutcliffe

Differential Revision: https://dev.swift-project.org/D18

samples/blackmisc/main.cpp

@@ -33,9 +33,6 @@ int main(int argc, char *argv[])
 {
     // I use CGuiApplication and not core application
     // otherwise no QPixmap metadata (metadata sample)
-#ifdef Q_OS_MAC
-    QCoreApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     QCoreApplication qa(argc, argv);
     CApplication a(CApplicationInfo::Sample);
     Q_UNUSED(qa);

samples/blackmiscdbus/main.cpp

@@ -38,9 +38,6 @@ int main(int argc, char *argv[])
     // is just for testing, I did not split it up
 
     BlackMisc::registerMetadata();
-#ifdef Q_OS_MAC
-    QCoreApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     QCoreApplication a(argc, argv);
     QTextStream out(stdout, QIODevice::WriteOnly);
     QTextStream qtin(stdin);

samples/blackmiscquantities/main.cpp

@@ -29,9 +29,6 @@ using namespace BlackCore;
 //! main
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_MAC
-    QCoreApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     QCoreApplication qa(argc, argv);
     CApplication a;
     Q_UNUSED(a);

samples/blackmiscsim/main.cpp

@@ -30,9 +30,6 @@ using namespace BlackMisc;
 //! main
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_MAC
-    QCoreApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     QCoreApplication qa(argc, argv);
     BlackCore::CApplication a;
     Q_UNUSED(a);

samples/cliclient/main.cpp

@@ -24,9 +24,6 @@ using namespace BlackMisc;
 //! main
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_MAC
-    QCoreApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     QCoreApplication app (argc, argv);
     BlackMisc::CLogHandler::instance()->install();
 

samples/hotkey/main.cpp

@@ -22,9 +22,6 @@ using namespace BlackGui;
 //! main
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_MAC
-    QApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     CGuiApplication::highDpiScreenSupport();
     QApplication qa(argc, argv);
     CGuiApplication a("samplehotkey", BlackMisc::CApplicationInfo::Sample, QPixmap());

samples/hotkey/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins = ../..

samples/hotkey/samplehotkey.pro

@@ -20,4 +20,11 @@ DESTDIR = $$DestRoot/bin
 target.path = $$PREFIX/bin
 INSTALLS += target
 
+macx {
+    # Modifies plugin path
+    qtconf.path = $$PREFIX/bin/samplehotkey.app/Contents/Resources
+    qtconf.files = qt.conf
+    INSTALLS += qtconf
+}
+
 load(common_post)

samples/weatherdata/main.cpp

@@ -27,9 +27,6 @@ using namespace BlackMisc::PhysicalQuantities;
 //! main
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_MAC
-    QCoreApplication::addLibraryPath(CDirectoryUtils::applicationDirectoryPath());
-#endif
     QCoreApplication a(argc, argv);
     BlackMisc::registerMetadata();
     CLogHandler::instance()->install(true);

src/swiftcore/main.cpp

@@ -26,9 +26,6 @@ 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

src/swiftcore/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins = ../..

src/swiftcore/swiftcore.pro

@@ -29,4 +29,11 @@ DESTDIR = $$DestRoot/bin
 target.path = $$PREFIX/bin
 INSTALLS += target
 
+macx {
+    # Modifies plugin path
+    qtconf.path = $$PREFIX/bin/swiftcore.app/Contents/Resources
+    qtconf.files = qt.conf
+    INSTALLS += qtconf
+}
+
 load(common_post)

src/swiftdata/main.cpp

@@ -24,9 +24,6 @@ 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);

src/swiftdata/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins = ../..

src/swiftdata/swiftdata.pro

@@ -30,4 +30,11 @@ DESTDIR = $$DestRoot/bin
 target.path = $$PREFIX/bin
 INSTALLS += target
 
+macx {
+    # Modifies plugin path
+    qtconf.path = $$PREFIX/bin/swiftdata.app/Contents/Resources
+    qtconf.files = qt.conf
+    INSTALLS += qtconf
+}
+
 load(common_post)

src/swiftguistandard/main.cpp

@@ -23,9 +23,6 @@ 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

src/swiftguistandard/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins = ../..

src/swiftguistandard/swiftguistandard.pro

@@ -30,4 +30,11 @@ DESTDIR = $$DestRoot/bin
 target.path = $$PREFIX/bin
 INSTALLS += target
 
+macx {
+    # Modifies plugin path
+    qtconf.path = $$PREFIX/bin/swiftguistd.app/Contents/Resources
+    qtconf.files = qt.conf
+    INSTALLS += qtconf
+}
+
 load(common_post)

src/swiftlauncher/main.cpp

@@ -30,9 +30,6 @@ 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);

src/swiftlauncher/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins = ../..

src/swiftlauncher/swiftlauncher.pro

@@ -31,4 +31,11 @@ DESTDIR = $$DestRoot/bin
 target.path = $$PREFIX/bin
 INSTALLS += target
 
+macx {
+    # Modifies plugin path
+    qtconf.path = $$PREFIX/bin/swiftlauncher.app/Contents/Resources
+    qtconf.files = qt.conf
+    INSTALLS += qtconf
+}
+
 load(common_post)