Merge pull request #422 from DonLakeFlyer/Mavericks_Fix

Mavericks fix to APM_Toolbar

src/ui/apmtoolbar.cpp

@@ -10,7 +10,16 @@ APMToolBar::APMToolBar(QWidget *parent):
     QDeclarativeView(parent), m_uas(0)
 {
     // Configure our QML object
+    
+    // Hack to fix QTBUG 34300 on OSX where QDir::currentPath has changed behavior. This causes
+    // relative paths to inside the .app package to fail.
+#ifdef Q_OS_MAC
+    QString qmlFile = QApplication::applicationDirPath();
+    qmlFile.append("/qml/ApmToolBar.qml");
+    setSource(QUrl::fromLocalFile(qmlFile));
+#else
     setSource(QUrl::fromLocalFile("qml/ApmToolBar.qml"));
+#endif
     setResizeMode(QDeclarativeView::SizeRootObjectToView);
     this->rootContext()->setContextProperty("globalObj", this);
     connect(LinkManager::instance(),SIGNAL(newLink(LinkInterface*)),