diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index 68ac777..ca5a38d 100644 --- a/src/plugin/plugin.cpp +++ b/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(uri, 1, 0, "AboutSettings"); qmlRegisterType(uri, 1, 0, "PartitionModel"); qRegisterMetaType("Partition"); +#ifdef DEVELOPER_MODE_ENABLED qmlRegisterType(uri, 1, 0, "DeveloperModeSettings"); + qRegisterMetaType("DeveloperModeSettings::Status"); +#endif qmlRegisterType(uri, 1, 0, "CertificateModel"); qmlRegisterSingletonType(uri, 1, 0, "SettingsVpnModel", api_factory); - qRegisterMetaType("DeveloperModeSettings::Status"); qmlRegisterType(uri, 1, 0, "BatteryStatus"); qmlRegisterType(uri, 1, 0, "DiskUsage"); qmlRegisterType(uri, 1, 0, "LocationSettings"); diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro index 0b74325..14f9790 100644 --- a/src/plugin/plugin.pro +++ b/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 + +CONFIG(!disableDevmode) { + PKGCONFIG += packagekitqt5 + DEFINES += DEVELOPER_MODE_ENABLED +} target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH INSTALLS += target diff --git a/src/src.pro b/src/src.pro index 512207d..4d28cde 100644 --- a/src/src.pro +++ b/src/src.pro @@ -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) @@ -24,7 +25,6 @@ SOURCES += \ displaysettings.cpp \ aboutsettings.cpp \ certificatemodel.cpp \ - developermodesettings.cpp \ batterystatus.cpp \ diskusage.cpp \ diskusage_impl.cpp \ @@ -53,7 +53,6 @@ PUBLIC_HEADERS = \ aboutsettings.h \ certificatemodel.h \ settingsvpnmodel.h \ - developermodesettings.h \ batterystatus.h \ udisks2block_p.h \ udisks2defines.h \ @@ -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