git.iko.soy/unity8
on xenial help sign in
Fix build errors
c0e2979Ricardo Mendoza
main.cpp+2−4
compare with xenial
unifiedsplit
@@ -76,7 +76,7 @@ void resolveIconTheme() {
76}
76}
77} // namespace {
77} // namespace {
78
78
79−int startShell(int argc, char** argv, ShellServerConfiguration* server)
79+int startShell(int argc, const char** argv, ShellServerConfiguration* server)
80{
80{
81 /* Workaround Qt platform integration plugin not advertising itself
81 /* Workaround Qt platform integration plugin not advertising itself
82 as having the following capabilities:
82 as having the following capabilities:
@@ -152,9 +152,7 @@ int startShell(int argc, char** argv, ShellServerConfiguration* server)
152 appendImportPaths(view->engine(), ::fallbackImportPaths());
152 appendImportPaths(view->engine(), ::fallbackImportPaths());
153
153
154 QStringList importPath = view->engine()->importPathList().filter("qt5/imports");
154 QStringList importPath = view->engine()->importPathList().filter("qt5/imports");
155− qDebug << "Import list is: " << importPath.first();
156−
157− if (isUbuntuMirServer)
155+ if (isUbuntuMirServer) {
158 importPath.first().append("/Unity-Mir");
156 importPath.first().append("/Unity-Mir");
159 view->engine()->addImportPath(importPath.first());
157 view->engine()->addImportPath(importPath.first());
160 }
158 }