Skip to content

Commit

Permalink
Renaming for consistency's sake
Browse files Browse the repository at this point in the history
  • Loading branch information
dogmaphobic committed Jul 8, 2015
1 parent 1059275 commit fc83d5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion QGCInstaller.pri
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# -------------------------------------------------

installer {
DEFINES += __installer_version__
DEFINES += QGC_INSTALL_RELEASE
MacBuild {
VideoEnabled {
# Install the gstreamer framework
Expand Down
4 changes: 2 additions & 2 deletions src/QGCApplication.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static QObject* mavManagerSingletonFactory(QQmlEngine*, QJSEngine*)
#if defined(QGC_GST_STREAMING)
#ifdef Q_OS_MAC
#ifndef __ios__
#ifdef __installer_version__
#ifdef QGC_INSTALL_RELEASE
static void qgcputenv(const QString& key, const QString& root, const QString& path)
{
QString value = root + path;
Expand Down Expand Up @@ -282,7 +282,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
#if defined(QGC_GST_STREAMING)
#ifdef Q_OS_MAC
#ifndef __ios__
#ifdef __installer_version__
#ifdef QGC_INSTALL_RELEASE
QString currentDir = QCoreApplication::applicationDirPath();
qgcputenv("GST_PLUGIN_SCANNER", currentDir, "/gst-plugin-scanner");
qgcputenv("GTK_PATH", currentDir, "/../Frameworks/GStreamer.framework/Versions/Current");
Expand Down

0 comments on commit fc83d5f

Please sign in to comment.