comparison src/hgrunner.cpp @ 699:646e48a0d3a5

Some work on macOS packaging

 #include <QTemporaryFile>
 #include <QDir>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QGridLayout>
+#include <QCoreApplication>
 
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

 #include <process.h>
 #endif
 
 HgRunner::HgRunner(QString myDirPath, QWidget *parent) :
     QWidget(parent),
-    m_myDirPath(myDirPath),
-    m_ptyFile(0)
+    m_ptyFile(0),
+    m_proc(0),
+    m_myDirPath(myDirPath)
 {
     QGridLayout *layout = new QGridLayout(this);
     layout->setMargin(0);
 
     m_progress = new QProgressBar;

 
 #ifdef Q_OS_MAC
     if (QSettings().value("python32", false).toBool()) {
         env.insert("VERSIONER_PYTHON_PREFER_32_BIT", "1");
     }
+    QDir pluginDir(QCoreApplication::applicationDirPath());
+    pluginDir.cd("../plugins");
+    env.insert("QT_PLUGIN_PATH", pluginDir.canonicalPath());
 #endif
 
     env.insert("LANG", "en_US.utf8");
     env.insert("LC_ALL", "en_US.utf8");
     env.insert("HGENCODING", "utf8");