Commit ec1fe740 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb47664' into 'master'

[lipstick] Add localized version about setting stub. Contributes to JB#47664

See merge request !128
parents a5040318 65ba8193
......@@ -28,6 +28,7 @@ static const auto Imei = QStringLiteral("imei");
static const auto Serial = QStringLiteral("serial");
static const auto LocalizedOperatingSystemName = QStringLiteral("localizedOperatingSystemName");
static const auto OperatingSystemName = QStringLiteral("operatingSystemName");
static const auto LocalizedSoftwareVersion = QStringLiteral("localizedSoftwareVersion");
static const auto BaseOperatingSystemName = QStringLiteral("baseOperatingSystemName");
static const auto SoftwareVersion = QStringLiteral("softwareVersion");
static const auto SoftwareVersionId = QStringLiteral("softwareVersionId");
......@@ -41,6 +42,7 @@ public:
virtual void AboutSettingsConstructor(QObject *parent);
virtual void AboutSettingsDestructor();
virtual QString operatingSystemName() const;
virtual QString localizedSoftwareVersion() const;
virtual qlonglong totalDiskSpace() const;
virtual qlonglong availableDiskSpace() const;
......@@ -77,6 +79,12 @@ QString AboutSettingsStub::operatingSystemName() const
return stubReturnValue<QString>(OperatingSystemName);
}
QString AboutSettingsStub::localizedSoftwareVersion() const
{
stubMethodEntered(LocalizedSoftwareVersion);
return stubReturnValue<QString>(LocalizedSoftwareVersion);
}
qlonglong AboutSettingsStub::totalDiskSpace() const
{
stubMethodEntered(TotalDiskSpace);
......@@ -178,6 +186,11 @@ QString AboutSettings::operatingSystemName() const
return gAboutSettingsStub->operatingSystemName();
}
QString AboutSettings::localizedSoftwareVersion() const
{
return gAboutSettingsStub->localizedSoftwareVersion();
}
qlonglong AboutSettings::totalDiskSpace() const
{
return gAboutSettingsStub->totalDiskSpace();
......
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