Commit 39e1be83 authored by flypig's avatar flypig

Merge branch 'jb45378' into 'master'

Rename VpnModel class to SettingsVpnModel

See merge request !123
parents c684fdcf 34f0f3b0
......@@ -5,7 +5,7 @@ Name: lipstick-qt5
%define icondirectory %{_datadir}/icons/hicolor/86x86/apps
Summary: QML toolkit for homescreen creation
Version: 0.33.1
Version: 0.34.7
Release: 1
Group: System/Libraries
License: LGPLv2.1
......@@ -45,7 +45,7 @@ BuildRequires: qt5-qtgui-devel >= 5.2.1+git24
BuildRequires: qt5-qtwayland-wayland_egl-devel >= 5.4.0+git26
BuildRequires: doxygen
BuildRequires: qt5-qttools-qthelp-devel
Conflicts: meegotouch-systemui < 1.5.7
BuildRequires: nemo-qml-plugin-systemsettings >= 0.5.27
Obsoletes: libnotificationsystem0
Obsoletes: %{name}-screenshot
......
/***************************************************************************
**
** Copyright (C) 2016 - 2019 Jolla Ltd.
** Copyright (C) 2019 Open Mobile Platform LLC.
** Copyright (c) 2016 - 2019 Jolla Ltd.
** Copyright (c) 2019 Open Mobile Platform LLC.
**
** This file is part of lipstick.
**
......@@ -29,7 +29,7 @@
VpnAgent::VpnAgent(QObject *parent) :
QObject(parent),
m_window(0),
m_connections(new VpnModel(this))
m_connections(new SettingsVpnModel(this))
{
QTimer::singleShot(0, this, SLOT(createWindow()));
}
......
/***************************************************************************
**
** Copyright (C) 2016 Jolla Ltd.
** Contact: Matt Vogt <matthew.vogt@jollamobile.com>
** Copyright (c) 2016 - 2019 Jolla Ltd.
** Copyright (c) 2019 Open Mobile Platform LLC.
**
** This file is part of lipstick.
**
......@@ -22,7 +22,7 @@
#include <QDBusObjectPath>
#include <QList>
#include "vpnmodel.h"
#include "settingsvpnmodel.h"
#include "lipstickglobal.h"
......@@ -86,7 +86,7 @@ signals:
private:
HomeWindow *m_window;
VpnModel *m_connections;
SettingsVpnModel *m_connections;
struct Request {
Request(const QString &path, const QVariantMap &details, const QDBusMessage &request);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment