Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ssu
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core
ssu
Commits
62aa4f04
Commit
62aa4f04
authored
Sep 07, 2017
by
Matti Kosola
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jb32529' into 'master'
Jb32529 See merge request
!12
parents
e5b748c5
ebc878e3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
26 deletions
+2
-26
.gitignore
.gitignore
+1
-0
ssucli/ssuproxy.cpp
ssucli/ssuproxy.cpp
+0
-26
ssuks/ssukickstarter.cpp
ssuks/ssukickstarter.cpp
+1
-0
No files found.
.gitignore
View file @
62aa4f04
...
...
@@ -11,6 +11,7 @@ doc/latex
/rndssucli/ssuproxy.h
/.nodocs
ssucli/ssuproxy.h
ssucli/ssuproxy.cpp
*.o
RPMS/
installroot/
...
...
ssucli/ssuproxy.cpp
deleted
100644 → 0
View file @
e5b748c5
/*
* This file was generated by qdbusxml2cpp version 0.8
* Command line was: qdbusxml2cpp -c SsuProxy -p ssucli/ssuproxy.h:ssucli/ssuproxy.cpp dbus/org.nemo.ssu.xml
*
* qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
#include "ssucli/ssuproxy.h"
/*
* Implementation of interface class SsuProxy
*/
SsuProxy
::
SsuProxy
(
const
QString
&
service
,
const
QString
&
path
,
const
QDBusConnection
&
connection
,
QObject
*
parent
)
:
QDBusAbstractInterface
(
service
,
path
,
staticInterfaceName
(),
connection
,
parent
)
{
}
SsuProxy
::~
SsuProxy
()
{
}
ssuks/ssukickstarter.cpp
View file @
62aa4f04
...
...
@@ -372,6 +372,7 @@ bool SsuKickstarter::write(const QString &kickstart)
kout
.
setDevice
(
&
ks
);
kout
<<
displayName
<<
endl
;
kout
<<
kickstartType
<<
endl
;
kout
<<
"# DeviceModel: "
<<
deviceInfo
.
deviceModel
()
<<
endl
;
if
(
!
suggestedFeatures
.
isEmpty
())
kout
<<
suggestedFeatures
<<
endl
;
kout
<<
"# SuggestedImageType: "
<<
imageType
<<
endl
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment