Update platfrom information for iOS and add more information in the application info
This commit is contained in:
parent
9148be13d6
commit
37b08fb84b
@ -105,7 +105,19 @@ int main(int argc, char *argv[])
|
||||
|
||||
qCInfo(dcApplication()) << "-->" << application.applicationName() << APP_VERSION << QDateTime::currentDateTime().toString();
|
||||
qCInfo(dcApplication()) << "Command line:" << application.arguments().join(" ");
|
||||
qCInfo(dcApplication()) << "System:" << QSysInfo::machineHostName() << QSysInfo::prettyProductName() << QSysInfo::productType() << QSysInfo::productVersion() << PlatformHelper::instance()->deviceManufacturer() << PlatformHelper::instance()->deviceModel();
|
||||
qCInfo(dcApplication()) << "System: Device model:" << PlatformHelper::instance()->deviceModel();
|
||||
qCInfo(dcApplication()) << " Hostname:" << QSysInfo::machineHostName();
|
||||
qCInfo(dcApplication()) << " Product name:" << QSysInfo::prettyProductName();
|
||||
qCInfo(dcApplication()) << " Product type:" << QSysInfo::productType();
|
||||
qCInfo(dcApplication()) << " Product version:" << QSysInfo::productVersion();
|
||||
qCInfo(dcApplication()) << " Kernel type:" << QSysInfo::kernelType();
|
||||
qCInfo(dcApplication()) << " Kernel version:" << QSysInfo::kernelVersion();
|
||||
qCInfo(dcApplication()) << " Machine uid:" << QSysInfo::machineUniqueId();
|
||||
qCInfo(dcApplication()) << " CPU architecture:" << QSysInfo::currentCpuArchitecture();
|
||||
qCInfo(dcApplication()) << " Platform: Device:" << PlatformHelper::instance()->device();
|
||||
qCInfo(dcApplication()) << " Platform: Device serial:" << PlatformHelper::instance()->deviceSerial();
|
||||
qCInfo(dcApplication()) << " Platform: Device manufacturer:" << PlatformHelper::instance()->deviceManufacturer();
|
||||
|
||||
qCInfo(dcApplication()) << "Locale:" << QLocale() << QLocale().name() << QLocale().language();
|
||||
qCInfo(dcApplication()) << "SSL version:" << QSslSocket::sslLibraryVersionString();
|
||||
|
||||
|
||||
@ -119,7 +119,7 @@ void PlatformHelperAndroid::hideSplashScreen()
|
||||
QString PlatformHelperAndroid::machineHostname() const
|
||||
{
|
||||
// QSysInfo::machineHostname always gives "localhost" on android... best we can do here is:
|
||||
return deviceManufacturer() + " " + deviceModel();
|
||||
return deviceManufacturer() + " " + deviceModel();
|
||||
}
|
||||
|
||||
QString PlatformHelperAndroid::deviceSerial() const
|
||||
|
||||
@ -228,10 +228,6 @@ QString PlatformHelperIOS::machineHostname() const
|
||||
return hostName;
|
||||
}
|
||||
|
||||
const QString name = deviceName();
|
||||
if (!name.isEmpty() && name != "localhost") {
|
||||
return name;
|
||||
}
|
||||
|
||||
// Fall back to something user visible when the OS only reports "localhost".
|
||||
const QString model = deviceModel();
|
||||
@ -242,6 +238,7 @@ QString PlatformHelperIOS::machineHostname() const
|
||||
if (manufacturer.isEmpty() || model.startsWith(manufacturer)) {
|
||||
return model;
|
||||
}
|
||||
|
||||
return manufacturer + " " + model;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user