fix(解决编译问题): 解决找kabase的log位置不对的问题
This commit is contained in:
parent
0fb7e15d1a
commit
7694847d61
|
@ -1,3 +1,12 @@
|
|||
kylin-weather (3.2.0.3-ok4) yangtze; urgency=medium
|
||||
|
||||
* BUG号:无
|
||||
* 任务号:无
|
||||
* 其他改动说明:解决编译问题,修改kabase的log冲突,替换为项目下的kabaselog
|
||||
* 影响域:无其他影响
|
||||
|
||||
-- zoujunnan <zoujunnan@kylinos.cn> Wed, 20 Jul 2022 18:45:04 +0800
|
||||
|
||||
kylin-weather (3.2.0.3-ok3) yangtze; urgency=medium
|
||||
|
||||
* BUG号:无
|
||||
|
|
|
@ -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
|
|
@ -123,7 +123,7 @@ HEADERS += \
|
|||
global/corevar.h \
|
||||
global/viewvar.h \
|
||||
kabase/buriedpoint.hpp \
|
||||
kabase/Qt/log.hpp \
|
||||
kabase/Qt/kabaselog.hpp \
|
||||
kabase/utils.hpp \
|
||||
kabase/Qt/windowmanage.hpp \
|
||||
model/dataparser.h \
|
||||
|
|
4
main.cpp
4
main.cpp
|
@ -5,7 +5,7 @@
|
|||
#include <QDBusInterface>
|
||||
#include <single_application/single_application.hpp>
|
||||
#include <window_management.hpp>
|
||||
#include "log.hpp"
|
||||
#include "kabaselog.hpp"
|
||||
#include "windowmanage.hpp"
|
||||
|
||||
//初始化核心,初始化前端,启动时是否展示界面
|
||||
|
@ -24,7 +24,7 @@ int main(int argc, char *argv[])
|
|||
//适配4K屏以及分数缩放
|
||||
kdk::kabase::WindowManagement::setScalingProperties();
|
||||
//日志输出
|
||||
qInstallMessageHandler(::kabase::Log::logOutput);
|
||||
qInstallMessageHandler(::kabase::KabaseLog::logOutput);
|
||||
kdk::kabase::QtSingleApplication a(argc, argv);
|
||||
|
||||
a.setWindowIcon(QIcon::fromTheme("kylin-weather"));
|
||||
|
|
Loading…
Reference in New Issue