Skip to content
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

Make developer mode optional #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make developer mode optional #2

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
6 changes: 5 additions & 1 deletion src/plugin/plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
#include "alarmtonemodel.h"
#include "displaysettings.h"
#include "aboutsettings.h"
#ifdef DEVELOPER_MODE_ENABLED
#include "developermodesettings.h"
#endif
#include "batterystatus.h"
#include "diskusage.h"
#include "partitionmodel.h"
Expand Down Expand Up @@ -106,10 +108,12 @@ class SystemSettingsPlugin : public QQmlExtensionPlugin
qmlRegisterType<AboutSettings>(uri, 1, 0, "AboutSettings");
qmlRegisterType<PartitionModel>(uri, 1, 0, "PartitionModel");
qRegisterMetaType<Partition>("Partition");
#ifdef DEVELOPER_MODE_ENABLED
qmlRegisterType<DeveloperModeSettings>(uri, 1, 0, "DeveloperModeSettings");
qRegisterMetaType<DeveloperModeSettings::Status>("DeveloperModeSettings::Status");
#endif
qmlRegisterType<CertificateModel>(uri, 1, 0, "CertificateModel");
qmlRegisterSingletonType<SettingsVpnModel>(uri, 1, 0, "SettingsVpnModel", api_factory<SettingsVpnModel>);
qRegisterMetaType<DeveloperModeSettings::Status>("DeveloperModeSettings::Status");
qmlRegisterType<BatteryStatus>(uri, 1, 0, "BatteryStatus");
qmlRegisterType<DiskUsage>(uri, 1, 0, "DiskUsage");
qmlRegisterType<LocationSettings>(uri, 1, 0, "LocationSettings");
Expand Down
7 changes: 6 additions & 1 deletion src/plugin/plugin.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ CONFIG += qt plugin c++11 hide_symbols link_pkgconfig
QT += qml dbus network
QT -= gui

PKGCONFIG += profile usb-moded-qt5 libsailfishkeyprovider connman-qt5 packagekitqt5
PKGCONFIG += profile usb-moded-qt5 libsailfishkeyprovider connman-qt5

CONFIG(!disableDevmode) {
PKGCONFIG += packagekitqt5
DEFINES += DEVELOPER_MODE_ENABLED
}

target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
INSTALLS += target
Expand Down
16 changes: 13 additions & 3 deletions src/src.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ QT -= gui

CONFIG += c++11 hide_symbols link_pkgconfig
PKGCONFIG += profile mlite5 mce timed-qt5 blkid libcrypto libsailfishkeyprovider connman-qt5 glib-2.0
PKGCONFIG += ssu-sysinfo nemodbus packagekitqt5 libsystemd sailfishusermanager sailfishaccesscontrol

PKGCONFIG += ssu-sysinfo nemodbus libsystemd sailfishusermanager sailfishaccesscontrol
PKGCONFIG += qofono-qt5

system($$[QT_INSTALL_BINS]/qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
Expand All @@ -24,7 +25,6 @@ SOURCES += \
displaysettings.cpp \
aboutsettings.cpp \
certificatemodel.cpp \
developermodesettings.cpp \
batterystatus.cpp \
diskusage.cpp \
diskusage_impl.cpp \
Expand Down Expand Up @@ -53,7 +53,6 @@ PUBLIC_HEADERS = \
aboutsettings.h \
certificatemodel.h \
settingsvpnmodel.h \
developermodesettings.h \
batterystatus.h \
udisks2block_p.h \
udisks2defines.h \
Expand Down Expand Up @@ -86,6 +85,17 @@ HEADERS += \
udisks2monitor_p.h \
userinfo_p.h

CONFIG(disableDevmode) {
warning("Developer mode plugin disabled")
} else {
message("Developer mode plugin enabled")
PKGCONFIG += packagekitqt5
DEFINES += DEVELOPER_MODE_ENABLED

SOURCES += developermodesettings.cpp
PUBLIC_HEADERS += developermodesettings.h
}

DEFINES += \
SYSTEMSETTINGS_BUILD_LIBRARY

Expand Down