Skip to content

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

Added a compile time define to detect an installer version

parent e4715874
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
QGCInstaller.pri
View file @ 10592756
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
# ------------------------------------------------- # -------------------------------------------------
installer { installer {
DEFINES += __installer_version__
MacBuild { MacBuild {
VideoEnabled { VideoEnabled {
# Install the gstreamer framework # Install the gstreamer framework
......
src/QGCApplication.cc
View file @ 10592756
...@@ -134,6 +134,7 @@ static QObject* mavManagerSingletonFactory(QQmlEngine*, QJSEngine*) ...@@ -134,6 +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__
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;
...@@ -142,6 +143,7 @@ static void qgcputenv(const QString& key, const QString& root, const QString& pa ...@@ -142,6 +143,7 @@ static void qgcputenv(const QString& key, const QString& root, const QString& pa
#endif #endif
#endif #endif
#endif #endif
#endif
/** /**
* @brief Constructor for the main application. * @brief Constructor for the main application.
...@@ -280,6 +282,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -280,6 +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__
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");
...@@ -294,6 +297,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) ...@@ -294,6 +297,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
// } // }
#endif #endif
#endif #endif
#endif
#endif #endif
qmlRegisterType<VideoItem>("QGroundControl.QgcQtGStreamer", 1, 0, "VideoItem"); qmlRegisterType<VideoItem>("QGroundControl.QgcQtGStreamer", 1, 0, "VideoItem");
......
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