diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-06-08 23:54:30 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-06-08 23:54:30 +0200 |
| commit | 38e42ad79493afb759181fa5cead90c9b3483655 (patch) | |
| tree | 3c580f3fbaab794b39ff57b6c91b872ed2075b44 | |
| parent | 6d7bff2476459049f4f554291a680e0f6003ea66 (diff) | |
| download | MultiMC-38e42ad79493afb759181fa5cead90c9b3483655.tar MultiMC-38e42ad79493afb759181fa5cead90c9b3483655.tar.gz MultiMC-38e42ad79493afb759181fa5cead90c9b3483655.tar.lz MultiMC-38e42ad79493afb759181fa5cead90c9b3483655.tar.xz MultiMC-38e42ad79493afb759181fa5cead90c9b3483655.zip | |
GH-1049 fix bad ifdefs that prevent linux-specific env blacklisting
| -rw-r--r-- | logic/BaseProcess.cpp | 6 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftProcess.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/logic/BaseProcess.cpp b/logic/BaseProcess.cpp index 9d429605..b9aa295c 100644 --- a/logic/BaseProcess.cpp +++ b/logic/BaseProcess.cpp @@ -20,6 +20,8 @@ #include <QDir> #include <QEventLoop> +#define IBUS "@im=ibus" + MessageLevel::Enum MessageLevel::getLevel(const QString& levelName) { if (levelName == "MultiMC") @@ -82,7 +84,7 @@ void BaseProcess::init() qDebug() << "Env: ignoring" << key << value; continue; } -#ifdef LINUX +#ifdef Q_OS_LINUX // Do not pass LD_* variables to java. They were intended for MultiMC if(key.startsWith("LD_")) { @@ -101,7 +103,7 @@ void BaseProcess::init() qDebug() << "Env: " << key << value; env.insert(key, value); } -#ifdef LINUX +#ifdef Q_OS_LINUX // HACK: Workaround for QTBUG-42500 env.insert("LD_LIBRARY_PATH", ""); #endif diff --git a/logic/minecraft/MinecraftProcess.cpp b/logic/minecraft/MinecraftProcess.cpp index 71dd81ed..d0f2a6cc 100644 --- a/logic/minecraft/MinecraftProcess.cpp +++ b/logic/minecraft/MinecraftProcess.cpp @@ -31,8 +31,6 @@ #include "pathutils.h" #include "cmdutils.h" -#define IBUS "@im=ibus" - // constructor MinecraftProcess::MinecraftProcess(MinecraftInstancePtr inst) : BaseProcess(inst) { |