Merge branch 'qt-launcher' of https://github.com/danteruiz/hifi into qt-launcher

This commit is contained in:
Ryan Huffman 2019-10-15 14:42:58 -07:00
commit 746a800f0f

View file

@ -22,7 +22,8 @@ void launchClient(const QString& clientPath, const QString& homePath, const QStr
@"--defaultScriptsOverride", defaultScriptOverride.toNSString(),
@"--setBookmark", homeBookmark,
@"--no-updater",
@"--no-launcher", nil];
@"--no-launcher",
@"--suppress-settings-reset", nil];
} else {
arguments = [NSArray arrayWithObjects:
@"--url" , homePath.toNSString(),
@ -30,7 +31,8 @@ void launchClient(const QString& clientPath, const QString& homePath, const QStr
@"--defaultScriptsOverride", defaultScriptOverride.toNSString(),
@"--setBookmark", homeBookmark,
@"--no-updater",
@"--no-launcher", nil];
@"--no-launcher",
@"--suppress-settings-reset", nil];
}
NSWorkspace *workspace = [NSWorkspace sharedWorkspace];