diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-23 14:48:08 -0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-24 00:11:20 -0200 |
| commit | 74bc106757d8e50daba6935b0fea5f95236b31a4 (patch) | |
| tree | 604cf5cea4ca424c4f2eb68258890340bbd47f92 | |
| parent | a4a13912e44db56e431b00fd026606cb5266100b (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-win_fix.tar.gz | |
[qt] Use qWarning() for loggingupstream/tmpsantos-win_fix
This is the Qt default and it is thread-safe.
| -rw-r--r-- | platform/qt/qt.cmake | 4 | ||||
| -rwxr-xr-x | platform/qt/src/qt_logging.cpp | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index f832dd593c..1bcb869fc9 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -21,9 +21,6 @@ set(MBGL_QT_CORE_FILES PRIVATE platform/default/mbgl/gl/headless_display.hpp PRIVATE platform/qt/src/headless_backend_qt.cpp - # Misc - PRIVATE platform/default/logging_stderr.cpp - # Thread pool PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp @@ -36,6 +33,7 @@ set(MBGL_QT_CORE_FILES # Platform integration PRIVATE platform/qt/src/async_task.cpp PRIVATE platform/qt/src/async_task_impl.hpp + PRIVATE platform/qt/src/qt_logging.cpp PRIVATE platform/qt/src/qt_image.cpp PRIVATE platform/qt/src/run_loop.cpp PRIVATE platform/qt/src/run_loop_impl.hpp diff --git a/platform/qt/src/qt_logging.cpp b/platform/qt/src/qt_logging.cpp new file mode 100755 index 0000000000..acbe9562d0 --- /dev/null +++ b/platform/qt/src/qt_logging.cpp @@ -0,0 +1,12 @@ +#include <mbgl/util/logging.hpp> +#include <mbgl/util/enum.hpp> + +#include <QDebug> + +namespace mbgl { + +void Log::platformRecord(EventSeverity severity, const std::string &msg) { + qWarning() << "[" << Enum<EventSeverity>::toString(severity) << "] " << QString::fromStdString(msg); +} + +} // namespace mbgl |