Merge branch 'jb49715' into 'master'

[lipstick] Don't construct the embedded ConnectionSelector window by default.... See merge request mer-core/lipstick!142
sailfishos · Sep 30, 2020 · bfd36aa · bfd36aa
2 parents 147b965 + 0993ac4
commit bfd36aa
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 144 deletions.
diff --git a/src/connectionselector.cpp b/src/connectionselector.cpp
diff --git a/src/connectionselector.h b/src/connectionselector.h
diff --git a/src/homeapplication.cpp b/src/homeapplication.cpp
@@ -45,7 +45,6 @@
 #include "usbmodeselector.h"
 #include "shutdownscreen.h"
 #include "shutdownscreenadaptor.h"
-#include "connectionselector.h"
 #include "screenshotservice.h"
 #include "vpnagent.h"
 #include "connmanvpnagent.h"
@@ -117,7 +116,6 @@ HomeApplication::HomeApplication(int &argc, char **argv, const QString &qmlPath)
     m_usbModeSelector = new USBModeSelector(deviceLock, this);
     m_shutdownScreen = new ShutdownScreen(this);
     new ShutdownScreenAdaptor(m_shutdownScreen);
-    m_connectionSelector = new ConnectionSelector(this);
 
     // MCE and usb-moded expect services to be registered on the system bus
     QDBusConnection systemBus = QDBusConnection::systemBus();

diff --git a/src/homeapplication.h b/src/homeapplication.h
@@ -183,9 +183,6 @@ private slots:
     //! Logic for showing the shutdown screen and related notifications
     ShutdownScreen *m_shutdownScreen;
 
-    //! Login for showing the connection selector
-    ConnectionSelector *m_connectionSelector;
-
     //! Whether the home ready signal has been sent or not
     bool m_homeReadySent;
 

diff --git a/src/src.pro b/src/src.pro
@@ -53,8 +53,7 @@ PUBLICHEADERS += \
     devicestate/devicestate.h \
     devicestate/thermal.h \
     vpnagent.h \
-    connectivitymonitor.h \
-    connectionselector.h
+    connectivitymonitor.h
 
 INSTALLS += publicheaderfiles dbus_policy
 publicheaderfiles.files = $$PUBLICHEADERS
@@ -127,7 +126,6 @@ SOURCES += \
     connmanvpnproxy.cpp \
     connmanmanagerproxy.cpp \
     connmanserviceproxy.cpp \
-    connectionselector.cpp \
     lipstickapi.cpp \
     screenshotservice.cpp \
     notifications/thermalnotifier.cpp \