Skip to content

fix(QmlControls): keep qgc_version.h out of moc'd header to preserve moc cache #14869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DonLakeFlyer wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

fix(QmlControls): keep qgc_version.h out of moc'd header to preserve moc cache #14869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/QmlControls/QGroundControlQmlGlobal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include <QtGui/QClipboard>
#include <QtGui/QGuiApplication>

#include "qgc_version.h"

#include "QGCLoggingCategory.h"

QGC_LOGGING_CATEGORY(GuidedActionsControllerLog, "QMLControls.GuidedActionsController")
Expand Down Expand Up @@ -294,6 +296,11 @@ QString QGroundControlQmlGlobal::qgcVersion(void)
return versionStr;
}

QString QGroundControlQmlGlobal::qgcAppDate()
{
return QGC_APP_DATE;
}

QString QGroundControlQmlGlobal::altitudeFrameExtraUnits(AltitudeFrame altFrame)
{
switch (altFrame) {
Expand Down Expand Up @@ -381,5 +388,3 @@ QString QGroundControlQmlGlobal::appName()
{
return QCoreApplication::applicationName();
}


3 changes: 1 addition & 2 deletions src/QmlControls/QGroundControlQmlGlobal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <QtQmlIntegration/QtQmlIntegration>

#include "QmlUnitsConversion.h"
#include "qgc_version.h"

class ADSBVehicleManager;
class FactGroup;
Expand Down Expand Up @@ -194,7 +193,7 @@ class QGroundControlQmlGlobal : public QObject
QString telemetryFileExtension (void) const;

static QString qgcVersion();
static QString qgcAppDate() { return QGC_APP_DATE; }
static QString qgcAppDate();
#ifdef QGC_DAILY_BUILD
static bool qgcDailyBuild() { return true; }
#else
Expand Down
Loading