From c6260b5dcb9ab5ab35d8f89444576914f6a4b036 Mon Sep 17 00:00:00 2001 From: xarkes Date: Wed, 5 Sep 2018 07:46:40 +0200 Subject: [PATCH] Rename macro for travis (#671) --- src/Cutter.cpp | 6 +++--- src/utils/JupyterConnection.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Cutter.cpp b/src/Cutter.cpp index 3a2d18dad8f0d..8826dc5a19089 100644 --- a/src/Cutter.cpp +++ b/src/Cutter.cpp @@ -55,17 +55,17 @@ CutterCore::CutterCore(QObject *parent) : #if defined(APPIMAGE) || defined(MACOS_R2_BUNDLED) auto prefix = QDir(QCoreApplication::applicationDirPath()); -# ifdef APPIMAGE +#ifdef APPIMAGE // Executable is in appdir/bin prefix.cdUp(); qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for AppImage."; -# else // MACOS_R2_BUNDLED +#else // MACOS_R2_BUNDLED // Executable is in Contents/MacOS, prefix is Contents/Resources/r2 prefix.cdUp(); prefix.cd("Resources"); prefix.cd("r2"); qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for macOS Application Bundle."; -# endif +#endif setConfig("dir.prefix", prefix.absolutePath()); #endif diff --git a/src/utils/JupyterConnection.cpp b/src/utils/JupyterConnection.cpp index e5fd086267adc..31aef89b8481a 100644 --- a/src/utils/JupyterConnection.cpp +++ b/src/utils/JupyterConnection.cpp @@ -52,16 +52,16 @@ void JupyterConnection::initPython() #if defined(APPIMAGE) || defined(MACOS_PYTHON_FRAMEWORK_BUNDLED) if (customPythonHome.isNull()) { auto pythonHomeDir = QDir(QCoreApplication::applicationDirPath()); -# ifdef APPIMAGE +#ifdef APPIMAGE // Executable is in appdir/bin pythonHomeDir.cdUp(); qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << " for AppImage."; -# else // MACOS_PYTHON_FRAMEWORK_BUNDLED +#else // MACOS_PYTHON_FRAMEWORK_BUNDLED // @executable_path/../Frameworks/Python.framework/Versions/Current pythonHomeDir.cd("../Frameworks/Python.framework/Versions/Current"); qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << " for macOS Application Bundle."; -# endif +#endif customPythonHome = pythonHomeDir.absolutePath(); } #endif