Mercurial > hg > easyhg
diff src/hgrunner.cpp @ 699:646e48a0d3a5
Some work on macOS packaging
author | Chris Cannam |
---|---|
date | Tue, 11 Dec 2018 16:40:57 +0000 |
parents | 7194ca023517 |
children | 07c610b06e58 |
line wrap: on
line diff
--- a/src/hgrunner.cpp Mon Dec 10 17:52:27 2018 +0000 +++ b/src/hgrunner.cpp Tue Dec 11 16:40:57 2018 +0000 @@ -28,6 +28,7 @@ #include <QProgressBar> #include <QPushButton> #include <QGridLayout> +#include <QCoreApplication> #include <iostream> #include <errno.h> @@ -44,8 +45,9 @@ 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); @@ -586,6 +588,9 @@ 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");