Skip to content

Q
qgroundcontrol
Commit fc83d5fd authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Renaming for consistency's sake

parent 10592756
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
QGCInstaller.pri
View file @ fc83d5fd
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# ------------------------------------------------- # -------------------------------------------------
installer { installer {
DEFINES += __installer_version__ DEFINES += QGC_INSTALL_RELEASE
MacBuild { MacBuild {
VideoEnabled { VideoEnabled {
# Install the gstreamer framework # Install the gstreamer framework
......
src/QGCApplication.cc
View file @ fc83d5fd
...@@ -134,7 +134,7 @@ static QObject* mavManagerSingletonFactory(QQmlEngine*, QJSEngine*) ...@@ -134,7 +134,7 @@ static QObject* mavManagerSingletonFactory(QQmlEngine*, QJSEngine*)
#if defined(QGC_GST_STREAMING) #if defined(QGC_GST_STREAMING)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#ifndef __ios__ #ifndef __ios__
#ifdef __installer_version__ #ifdef QGC_INSTALL_RELEASE
static void qgcputenv(const QString& key, const QString& root, const QString& path) static void qgcputenv(const QString& key, const QString& root, const QString& path)
{ {
QString value = root + path; QString value = root + path;
...@@ -282,7 +282,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -282,7 +282,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
#if defined(QGC_GST_STREAMING) #if defined(QGC_GST_STREAMING)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#ifndef __ios__ #ifndef __ios__
#ifdef __installer_version__ #ifdef QGC_INSTALL_RELEASE
QString currentDir = QCoreApplication::applicationDirPath(); QString currentDir = QCoreApplication::applicationDirPath();
qgcputenv("GST_PLUGIN_SCANNER", currentDir, "/gst-plugin-scanner"); qgcputenv("GST_PLUGIN_SCANNER", currentDir, "/gst-plugin-scanner");
qgcputenv("GTK_PATH", currentDir, "/../Frameworks/GStreamer.framework/Versions/Current"); qgcputenv("GTK_PATH", currentDir, "/../Frameworks/GStreamer.framework/Versions/Current");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment