diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-19 15:39:03 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-09-19 15:39:48 +0200 |
| commit | ea364b4cde9feb49e9f15313fb1b78e858580b70 (patch) | |
| tree | 78d13701311eeff84c287fceee979b900c560cb7 | |
| parent | bca0e8b3169e62414942532745c4ffe76549b12a (diff) | |
| parent | 9d372b44458baeab4ee5d131477dfc4bbd858f6b (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I61180ae3eb1e00490089ef6fb4deb29918766d87
| -rw-r--r-- | src/geniviextras/configure.json | 2 | ||||
| -rw-r--r-- | src/geniviextras/qdltregistration.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/geniviextras/configure.json b/src/geniviextras/configure.json index df101a8..38bae96 100644 --- a/src/geniviextras/configure.json +++ b/src/geniviextras/configure.json @@ -18,7 +18,7 @@ ] }, "dlt_2_12": { - "label": "DLT > 2.12", + "label": "DLT >= 2.12", "test": "dlt", "sources": [ { "type": "pkgConfig", "args": "automotive-dlt >= 2.12.0" }, diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp index e2dc499..f492556 100644 --- a/src/geniviextras/qdltregistration.cpp +++ b/src/geniviextras/qdltregistration.cpp @@ -90,7 +90,7 @@ void QDltRegistrationPrivate::registerCategory(CategoryInfo &info) Q_ASSERT_X(m_dltAppRegistered, "registerCategory", "A DLT Application needs to be registered before registering a Logging Category"); DLT_REGISTER_CONTEXT_LL_TS(*info.m_context, info.m_ctxName, info.m_ctxDescription, category2dltLevel(info.m_category), DLT_TRACE_STATUS_DEFAULT); -#ifdef QT_FEATURE_dlt_2_12 +#if QT_CONFIG(dlt_2_12) //TODO move to lamda once c++11 is ok to be used DLT_REGISTER_LOG_LEVEL_CHANGED_CALLBACK(*info.m_context, &qtGeniviLogLevelChangedHandler); #endif |