Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb49233' into 'master'
[developermode] Assume emulators are always developer enabled. JB#49233

See merge request mer-core/nemo-qml-plugin-systemsettings!159
  • Loading branch information
Tomin1 committed Nov 11, 2020
2 parents 309d228 + 9caa6d8 commit 8ba8cea
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/developermodesettings.cpp
Expand Up @@ -55,6 +55,8 @@
#define DEVELOPER_MODE_PACKAGE "jolla-developer-mode"
#define DEVELOPER_MODE_PACKAGE_PRELOAD_DIR "/var/lib/jolla-developer-mode/preloaded/"

#define EMULATOR_PROVIDED_FILE "/etc/sailfishos-emulator"

/* D-Bus service */
#define USB_MODED_SERVICE "com.meego.usb_moded"
#define USB_MODED_PATH "/com/meego/usb_moded"
Expand Down Expand Up @@ -115,7 +117,7 @@ DeveloperModeSettings::DeveloperModeSettings(QObject *parent)
, m_usbInterface(USB_NETWORK_FALLBACK_INTERFACE)
, m_usbIpAddress(USB_NETWORK_FALLBACK_IP)
, m_username(qgetenv("USER"))
, m_developerModeEnabled(QFile::exists(DEVELOPER_MODE_PROVIDED_FILE))
, m_developerModeEnabled(QFile::exists(DEVELOPER_MODE_PROVIDED_FILE) || QFile::exists(EMULATOR_PROVIDED_FILE))
, m_workStatus(Idle)
, m_workProgress(PROGRESS_INDETERMINATE)
, m_transactionRole(PackageKit::Transaction::RoleUnknown)
Expand Down Expand Up @@ -558,7 +560,7 @@ void DeveloperModeSettings::updateState(int percentage, PackageKit::Transaction:
void DeveloperModeSettings::resetState()
{
if (m_installationType == DeveloperMode) {
bool enabled = QFile::exists(DEVELOPER_MODE_PROVIDED_FILE);
bool enabled = QFile::exists(DEVELOPER_MODE_PROVIDED_FILE) || QFile::exists(EMULATOR_PROVIDED_FILE);
if (m_developerModeEnabled != enabled) {
m_developerModeEnabled = enabled;
emit developerModeEnabledChanged();
Expand Down

0 comments on commit 8ba8cea

Please sign in to comment.