Make developer mode optional

Author: neochapay

src/plugin/plugin.cpp

@@ -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"
@@ -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");

src/plugin/plugin.pro

@@ -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
+
+DEVMODE {
+    PKGCONFIG += packagekitqt5
+    DEFINES += DEVELOPER_MODE_ENABLED
+}
 
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 INSTALLS += target

src/src.pro

@@ -7,9 +7,18 @@ 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
 
+CONFIG(disableDevmode) {
+    warning("Developer mode plugin disabled")
+} else {
+    message("Developer mode plugin enabled")
+    PKGCONFIG += packagekitqt5
+    DEFINES += DEVELOPER_MODE_ENABLED
+}
+
 system($$[QT_INSTALL_BINS]/qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
 
 SOURCES += \
@@ -24,7 +33,6 @@ SOURCES += \
     displaysettings.cpp \
     aboutsettings.cpp \
     certificatemodel.cpp \
-    developermodesettings.cpp \
     batterystatus.cpp \
     diskusage.cpp \
     diskusage_impl.cpp \
@@ -53,7 +61,6 @@ PUBLIC_HEADERS = \
     aboutsettings.h \
     certificatemodel.h \
     settingsvpnmodel.h \
-    developermodesettings.h \
     batterystatus.h \
     udisks2block_p.h \
     udisks2defines.h \
@@ -86,6 +93,11 @@ HEADERS += \
     udisks2monitor_p.h \
     userinfo_p.h
 
+CONFIG(DEVELOPER_MODE_ENABLED) {
+    SOURCES += developermodesettings.cpp
+    PUBLIC_HEADERS += developermodesettings.h
+}
+
 DEFINES += \
     SYSTEMSETTINGS_BUILD_LIBRARY