mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 18:18:02 +02:00
Fix DS
This commit is contained in:
parent
d5429e76da
commit
5bae69bb51
3 changed files with 7 additions and 6 deletions
|
@ -79,13 +79,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
|
||||||
|
|
||||||
connect(this, &QCoreApplication::aboutToQuit, this, &DomainServer::aboutToQuit);
|
connect(this, &QCoreApplication::aboutToQuit, this, &DomainServer::aboutToQuit);
|
||||||
|
|
||||||
setApplicationName(BuildInfo::DOMAIN_SERVER_NAME);
|
|
||||||
setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
|
|
||||||
setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
|
||||||
setApplicationVersion(BuildInfo::VERSION);
|
|
||||||
|
|
||||||
qDebug() << "Setting up domain-server";
|
qDebug() << "Setting up domain-server";
|
||||||
|
|
||||||
qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
|
qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
|
||||||
qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
|
qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
|
||||||
qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION;
|
qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION;
|
||||||
|
|
|
@ -19,12 +19,18 @@
|
||||||
|
|
||||||
#include <LogHandler.h>
|
#include <LogHandler.h>
|
||||||
#include <SharedUtil.h>
|
#include <SharedUtil.h>
|
||||||
|
#include <BuildInfo.h>
|
||||||
|
|
||||||
#include "DomainServer.h"
|
#include "DomainServer.h"
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
disableQtBearerPoll(); // Fixes wifi ping spikes
|
disableQtBearerPoll(); // Fixes wifi ping spikes
|
||||||
|
|
||||||
|
QCoreApplication::setApplicationName(BuildInfo::DOMAIN_SERVER_NAME);
|
||||||
|
QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
|
||||||
|
QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
|
||||||
|
QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
setvbuf(stdout, NULL, _IOLBF, 0);
|
setvbuf(stdout, NULL, _IOLBF, 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -45,6 +45,7 @@ namespace Setting {
|
||||||
// Set settings format
|
// Set settings format
|
||||||
QSettings::setDefaultFormat(JSON_FORMAT);
|
QSettings::setDefaultFormat(JSON_FORMAT);
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
|
qCDebug(shared) << "Settings file:" << settings.fileName();
|
||||||
|
|
||||||
if (settings.allKeys().isEmpty()) {
|
if (settings.allKeys().isEmpty()) {
|
||||||
loadOldINIFile(settings);
|
loadOldINIFile(settings);
|
||||||
|
|
Loading…
Reference in a new issue