VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 17:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Logging: also print pointer size of building architecture

Browse Source
This commit is contained in:
f4exb 2018-01-07 03:20:27 +01:00
parent 333df92c06
commit 1f4cdd1f3c
4 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/main.cpp
View File

@ -95,14 +95,19 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
parser.parse(*qApp); parser.parse(*qApp);
#if QT_VERSION >= 0x050400 #if QT_VERSION >= 0x050400
qInfo("%s v%s Qt %s %s %s", qInfo("%s %s Qt %s %db %s %s",
qPrintable(qApp->applicationName()), qPrintable(qApp->applicationName()),
qPrintable(qApp->applicationVersion()), qPrintable(qApp->applicationVersion()),
qPrintable(QString(QT_VERSION_STR)), qPrintable(QString(QT_VERSION_STR)),
QT_POINTER_SIZE*8,
qPrintable(QSysInfo::currentCpuArchitecture()), qPrintable(QSysInfo::currentCpuArchitecture()),
qPrintable(QSysInfo::prettyProductName())); qPrintable(QSysInfo::prettyProductName()));
#else #else
qInfo("%s v%s Qt %s", qPrintable(qApp->applicationName()), qPrintable((qApp->applicationVersion()), qPrintable(QString(QT_VERSION_STR))); qInfo("%s %s Qt %s %db",
qPrintable(qApp->applicationName()),
qPrintable((qApp->applicationVersion()),
qPrintable(QString(QT_VERSION_STR)),
QT_POINTER_SIZE*8);
#endif #endif
MainWindow w(logger, parser); MainWindow w(logger, parser);

9
appsrv/main.cpp
View File

@ -65,14 +65,19 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
parser.parse(a); parser.parse(a);
#if QT_VERSION >= 0x050400 #if QT_VERSION >= 0x050400
qInfo("%s v%s Qt %s %s %s", qInfo("%s %s Qt %s %db %s %s",
qPrintable(qApp->applicationName()), qPrintable(qApp->applicationName()),
qPrintable(qApp->applicationVersion()), qPrintable(qApp->applicationVersion()),
qPrintable(QString(QT_VERSION_STR)), qPrintable(QString(QT_VERSION_STR)),
QT_POINTER_SIZE*8,
qPrintable(QSysInfo::currentCpuArchitecture()), qPrintable(QSysInfo::currentCpuArchitecture()),
qPrintable(QSysInfo::prettyProductName())); qPrintable(QSysInfo::prettyProductName()));
#else #else
qInfo("%s v%s Qt %s", qPrintable(qApp->applicationName()), qPrintable((qApp->applicationVersion()), qPrintable(QString(QT_VERSION_STR))); qInfo("%s %s Qt %s %db",
qPrintable(qApp->applicationName()),
qPrintable((qApp->applicationVersion()),
qPrintable(QString(QT_VERSION_STR)),
QT_POINTER_SIZE*8);
#endif #endif
MainCore m(logger, parser, &a); MainCore m(logger, parser, &a);

9
sdrgui/mainwindow.cpp
View File

@ -1729,19 +1729,20 @@ void MainWindow::setLoggingOptions()
if (m_settings.getUseLogFile()) if (m_settings.getUseLogFile())
{ {
#if QT_VERSION >= 0x050400 #if QT_VERSION >= 0x050400
QString appInfoStr(tr("%1 v%2 Qt %3 %4 %5") QString appInfoStr(tr("%1 %2 Qt %3 %4b %5 %6")
.arg(qApp->applicationName()) .arg(qApp->applicationName())
.arg(qApp->applicationVersion()) .arg(qApp->applicationVersion())
.arg(QT_VERSION_STR) .arg(QT_VERSION_STR)
.arg(QT_POINTER_SIZE*8)
.arg(QSysInfo::currentCpuArchitecture()) .arg(QSysInfo::currentCpuArchitecture())
.arg(QSysInfo::prettyProductName())); .arg(QSysInfo::prettyProductName()));
#else #else
QString appInfoStr(tr("%1 v%2 Qt %3") QString appInfoStr(tr("%1 v%2 Qt %3 %4b")
.arg(qApp->applicationName()) .arg(qApp->applicationName())
.arg(qApp->applicationVersion()) .arg(qApp->applicationVersion())
.arg(QT_VERSION_STR)); .arg(QT_VERSION_STR)
.arg(QT_POINTER_SIZE*8));
#endif #endif
m_logger->logToFile(QtInfoMsg, appInfoStr); m_logger->logToFile(QtInfoMsg, appInfoStr);
} }
} }

17
sdrsrv/maincore.cpp
View File

@ -221,19 +221,20 @@ void MainCore::setLoggingOptions()
if (m_settings.getUseLogFile()) if (m_settings.getUseLogFile())
{ {
#if QT_VERSION >= 0x050400 #if QT_VERSION >= 0x050400
QString appInfoStr(tr("%1 v%2 Qt %3 %4 %5") QString appInfoStr(tr("%1 %2 Qt %3 %4b %5 %6")
.arg(QCoreApplication::instance()->applicationName()) .arg(qApp->applicationName())
.arg(QCoreApplication::instance()->applicationVersion()) .arg(qApp->applicationVersion())
.arg(QT_VERSION_STR) .arg(QT_VERSION_STR)
.arg(QT_POINTER_SIZE*8)
.arg(QSysInfo::currentCpuArchitecture()) .arg(QSysInfo::currentCpuArchitecture())
.arg(QSysInfo::prettyProductName())); .arg(QSysInfo::prettyProductName()));
#else #else
QString appInfoStr(tr("%1 v%2 Qt %3") QString appInfoStr(tr("%1 v%2 Qt %3 %4b")
.arg(QCoreApplication::instance()->applicationName()) .arg(qApp->applicationName())
.arg(QCoreApplication::instance()->applicationVersion()) .arg(qApp->applicationVersion())
.arg(QT_VERSION_STR)); .arg(QT_VERSION_STR)
.arg(QT_POINTER_SIZE*8));
#endif #endif
m_logger->logToFile(QtInfoMsg, appInfoStr); m_logger->logToFile(QtInfoMsg, appInfoStr);
} }
} }