From fc83d5fd77ed74ab9f307f89fb2c5d49b33aac5b Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Wed, 8 Jul 2015 17:21:07 -0400 Subject: [PATCH] Renaming for consistency's sake --- QGCInstaller.pri | 2 +- src/QGCApplication.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/QGCInstaller.pri b/QGCInstaller.pri index 0597d92c5..e529a62f1 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -18,7 +18,7 @@ # ------------------------------------------------- installer { - DEFINES += __installer_version__ + DEFINES += QGC_INSTALL_RELEASE MacBuild { VideoEnabled { # Install the gstreamer framework diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 7f41565f1..d2a0b6524 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -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; @@ -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"); -- 2.22.0