diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-02-01 11:44:38 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-02-01 13:18:49 +0000 |
| commit | 9e18b1b2f8b319a41a8fc967e119156be4d8ae7b (patch) | |
| tree | 47d4dd880079399df7c8664492a57e503d3dff2c /src/geniviextras/qdltregistration.cpp | |
| parent | 54e452dc1b7f7db8a2c0e1cd5699e3097244e9a9 (diff) | |
Move qtivi over to the new config system
Use the new configuration system to define external
libraries, configure tests and features. Don't use
pkg-config outside of the configuration step.
The geniviextras-only CONFIG option has now been replaced with a
command-line option and can be used by passing it to qmake after '--'.
E.g. 'qmake -- --geniviextras-only'.
Removed adding DLT into the rpath. Similar to all other Qt modules, it
is now expected that packages found using pkg-config can be found by
the dynamic linker.
Change-Id: If46cd1b79413cd7571ee1068898848d9871e61ba
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/geniviextras/qdltregistration.cpp')
| -rw-r--r-- | src/geniviextras/qdltregistration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp index 364b97c..52dcc97 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 DLT_VERSION_2_12 +#ifdef QT_FEATURE_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 |