diff options
Diffstat (limited to 'src/lib/corelib/logging')
-rw-r--r-- | src/lib/corelib/logging/categories.cpp | 1 | ||||
-rw-r--r-- | src/lib/corelib/logging/categories.h | 1 | ||||
-rw-r--r-- | src/lib/corelib/logging/logger.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/logging/logging.pri | 18 |
4 files changed, 3 insertions, 19 deletions
diff --git a/src/lib/corelib/logging/categories.cpp b/src/lib/corelib/logging/categories.cpp index 0f844f5b4..5738dc21d 100644 --- a/src/lib/corelib/logging/categories.cpp +++ b/src/lib/corelib/logging/categories.cpp @@ -50,6 +50,7 @@ Q_LOGGING_CATEGORY(lcModuleLoader, "qbs.moduleloader", QtCriticalMsg) Q_LOGGING_CATEGORY(lcPluginManager, "qbs.pluginmanager", QtCriticalMsg) Q_LOGGING_CATEGORY(lcProjectResolver, "qbs.projectresolver", QtCriticalMsg) Q_LOGGING_CATEGORY(lcUpToDateCheck, "qbs.uptodate", QtCriticalMsg) +Q_LOGGING_CATEGORY(lcLoaderScheduling, "qbs.loader.scheduling", QtCriticalMsg) } // namespace Internal } // namespace qbs diff --git a/src/lib/corelib/logging/categories.h b/src/lib/corelib/logging/categories.h index 40c69845e..c8873c30c 100644 --- a/src/lib/corelib/logging/categories.h +++ b/src/lib/corelib/logging/categories.h @@ -53,6 +53,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcModuleLoader) Q_DECLARE_LOGGING_CATEGORY(lcPluginManager) Q_DECLARE_LOGGING_CATEGORY(lcProjectResolver) Q_DECLARE_LOGGING_CATEGORY(lcUpToDateCheck) +Q_DECLARE_LOGGING_CATEGORY(lcLoaderScheduling) } // namespace Internal } // namespace qbs diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp index d4f51cd30..65d0cc27f 100644 --- a/src/lib/corelib/logging/logger.cpp +++ b/src/lib/corelib/logging/logger.cpp @@ -231,7 +231,7 @@ void Logger::printWarning(const ErrorInfo &warning) LogWriter Logger::qbsLog(LoggerLevel level, bool force) const { - return LogWriter(m_logSink, level, force); + return {m_logSink, level, force}; } } // namespace Internal diff --git a/src/lib/corelib/logging/logging.pri b/src/lib/corelib/logging/logging.pri deleted file mode 100644 index 3a4379a9a..000000000 --- a/src/lib/corelib/logging/logging.pri +++ /dev/null @@ -1,18 +0,0 @@ -include(../../../install_prefix.pri) - -HEADERS += \ - $$PWD/categories.h \ - $$PWD/logger.h \ - $$PWD/translator.h \ - $$PWD/ilogsink.h - -SOURCES += \ - $$PWD/categories.cpp \ - $$PWD/logger.cpp \ - $$PWD/ilogsink.cpp - -!qbs_no_dev_install { - logging_headers.files = $$PWD/ilogsink.h - logging_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/logging - INSTALLS += logging_headers -} |