changeset 744:ccf3749cbaea

Fix to OS/X build -- we no longer want to override the plugin path as we're using qt.conf instead
author Chris Cannam
date Mon, 07 Jul 2014 07:55:49 +0100 (2014-07-07)
parents 4cec335bba8f
children d18c89386a71
files main/main.cpp
diffstat 1 files changed, 0 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/main/main.cpp	Fri Jul 04 11:08:05 2014 +0100
+++ b/main/main.cpp	Mon Jul 07 07:55:49 2014 +0100
@@ -198,22 +198,6 @@
         m_filepathQueue(QStringList()),
         m_mainWindow(0)
     {
-#ifdef Q_OS_MAC
-        // Override the Qt plugin load path. The default contains the
-        // Qt installation location as well as the application
-        // directory, but we don't ever want to load plugins from
-        // outside the app bundle because we don't know for sure what
-        // (potentially different) versions of the Qt framework
-        // libraries they may have dyld dependencies on.
-        QString apploc(applicationFilePath());
-        apploc.truncate(apploc.lastIndexOf(QLatin1Char('/')));
-        apploc = QDir(apploc).canonicalPath();
-        if (QFile::exists(apploc)) {
-            setLibraryPaths(QStringList() << apploc);
-        } else {
-            setLibraryPaths(QStringList());
-        }
-#endif
     }
     virtual ~SVApplication() { }