fix(编译错误): log和系统里文件名重复导致的编译错误

This commit is contained in:
zhaoyuzhen@kylinos.cn 2022-07-20 17:05:14 +08:00
parent 00760b759c
commit a2fd041246
3 changed files with 15 additions and 6 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
kylin-scanner (3.2.0.4-ok4) yangtze; urgency=medium
* BUG号
* 需求号:无
* 其他改动说明:编译错误修改
* 其他改动影响域:无
-- zhaoyuzhen <zhaoyuzhen@kylinos.cn> Mon, 19 Jul 2022 10:39:12 +0800
kylin-scanner (3.2.0.4-ok3) yangtze; urgency=medium
* BUG号#109782 【用户手册】【摄像头】用户手册首页摄像头的图标icon需替换为寻光主题图标

View File

@ -13,11 +13,11 @@
namespace kabase
{
class Log
class KabaseLog
{
public:
Log() = default;
~Log() = default;
KabaseLog() = default;
~KabaseLog() = default;
static void logOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
@ -50,4 +50,4 @@ public:
}
#endif
#endif

View File

@ -38,7 +38,7 @@
#include <QFileInfo>
#include <fstream>
#include <stdio.h>
#include "log.hpp"
#include "kabaselog.hpp"
#include "windowmanage.hpp"
#include <singleapplication.h>
#include <QDebug>
@ -150,7 +150,7 @@ static QString getAppVersion()
int main(int argc, char *argv[])
{
/* 使用sdk管理日志 */
qInstallMessageHandler(::kabase::Log::logOutput);
qInstallMessageHandler(::kabase::KabaseLog::logOutput);
QString scannerFileName;
if (argc > 1) {