diff --git a/QGCInstaller.pri b/QGCInstaller.pri index 77ebc2d27a969fe7c35f7b8b745e2d1cb22b2f39..0597d92c5c9a872fed86aade85ce286af8cea819 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -18,6 +18,7 @@ # ------------------------------------------------- installer { + DEFINES += __installer_version__ MacBuild { VideoEnabled { # Install the gstreamer framework diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 340c6a745deaec3b417184d008a5ff2f0ba9168a..7f41565f1c8876ec9acca1c77be739b28939dc79 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -134,6 +134,7 @@ static QObject* mavManagerSingletonFactory(QQmlEngine*, QJSEngine*) #if defined(QGC_GST_STREAMING) #ifdef Q_OS_MAC #ifndef __ios__ +#ifdef __installer_version__ static void qgcputenv(const QString& key, const QString& root, const QString& path) { QString value = root + path; @@ -142,6 +143,7 @@ static void qgcputenv(const QString& key, const QString& root, const QString& pa #endif #endif #endif +#endif /** * @brief Constructor for the main application. @@ -280,6 +282,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) #if defined(QGC_GST_STREAMING) #ifdef Q_OS_MAC #ifndef __ios__ +#ifdef __installer_version__ QString currentDir = QCoreApplication::applicationDirPath(); qgcputenv("GST_PLUGIN_SCANNER", currentDir, "/gst-plugin-scanner"); qgcputenv("GTK_PATH", currentDir, "/../Frameworks/GStreamer.framework/Versions/Current"); @@ -294,6 +297,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) // } #endif #endif +#endif #endif qmlRegisterType("QGroundControl.QgcQtGStreamer", 1, 0, "VideoItem");