diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-20 15:25:22 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-11-02 12:27:24 +0000 |
| commit | 824429627f383a5cc81d734999da9b39e17b49bd (patch) | |
| tree | e853269a0d612fbbd32a1265128b101530421397 | |
| parent | 1bbb334a9e3212a0fa8b06a328dadb6b0702fe1a (diff) | |
Allow compiling without tracepoints
Change-Id: Ia80c54fa3e8b93593a60b5d704c3857f0eea6a71
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| -rw-r--r-- | src/modules/Unity/Application/application_manager.cpp | 2 | ||||
| -rw-r--r-- | src/modules/Unity/Application/maybe_tracepoints.h | 5 | ||||
| -rw-r--r-- | src/modules/Unity/Application/mirsurfacemanager.cpp | 2 | ||||
| -rw-r--r-- | src/platforms/mirserver/maybe_tracepoints.h | 5 | ||||
| -rw-r--r-- | src/platforms/mirserver/mirwindowmanager.cpp | 2 | ||||
| -rw-r--r-- | src/platforms/mirserver/sessionauthorizer.cpp | 2 | ||||
| -rw-r--r-- | src/platforms/mirserver/sessionlistener.cpp | 2 |
7 files changed, 15 insertions, 5 deletions
diff --git a/src/modules/Unity/Application/application_manager.cpp b/src/modules/Unity/Application/application_manager.cpp index 9879dea..e15ea27 100644 --- a/src/modules/Unity/Application/application_manager.cpp +++ b/src/modules/Unity/Application/application_manager.cpp @@ -24,7 +24,7 @@ #include "proc_info.h" #include "taskcontroller.h" #include "upstart/applicationcontroller.h" -#include "tracepoints.h" // generated from tracepoints.tp +#include "maybe_tracepoints.h" #include "settings.h" // mirserver diff --git a/src/modules/Unity/Application/maybe_tracepoints.h b/src/modules/Unity/Application/maybe_tracepoints.h new file mode 100644 index 0000000..60b1116 --- /dev/null +++ b/src/modules/Unity/Application/maybe_tracepoints.h @@ -0,0 +1,5 @@ +#ifdef QT_MIR_NO_TRACEPOINTS +# define tracepoint(...) +#else +# include "tracepoints.h" // generated from tracepoints.tp +#endif diff --git a/src/modules/Unity/Application/mirsurfacemanager.cpp b/src/modules/Unity/Application/mirsurfacemanager.cpp index 262600f..2f19201 100644 --- a/src/modules/Unity/Application/mirsurfacemanager.cpp +++ b/src/modules/Unity/Application/mirsurfacemanager.cpp @@ -22,7 +22,7 @@ #include "mirsurfacemanager.h" #include "sessionmanager.h" #include "application_manager.h" -#include "tracepoints.h" // generated from tracepoints.tp +#include "maybe_tracepoints.h" // common #include <debughelpers.h> diff --git a/src/platforms/mirserver/maybe_tracepoints.h b/src/platforms/mirserver/maybe_tracepoints.h new file mode 100644 index 0000000..60b1116 --- /dev/null +++ b/src/platforms/mirserver/maybe_tracepoints.h @@ -0,0 +1,5 @@ +#ifdef QT_MIR_NO_TRACEPOINTS +# define tracepoint(...) +#else +# include "tracepoints.h" // generated from tracepoints.tp +#endif diff --git a/src/platforms/mirserver/mirwindowmanager.cpp b/src/platforms/mirserver/mirwindowmanager.cpp index 2123e73..9cadbcd 100644 --- a/src/platforms/mirserver/mirwindowmanager.cpp +++ b/src/platforms/mirserver/mirwindowmanager.cpp @@ -16,7 +16,7 @@ #include "mirwindowmanager.h" #include "logging.h" -#include "tracepoints.h" // generated from tracepoints.tp +#include "maybe_tracepoints.h" #include <mir/geometry/rectangle.h> #include <mir/scene/session.h> diff --git a/src/platforms/mirserver/sessionauthorizer.cpp b/src/platforms/mirserver/sessionauthorizer.cpp index 7cae915..80de95c 100644 --- a/src/platforms/mirserver/sessionauthorizer.cpp +++ b/src/platforms/mirserver/sessionauthorizer.cpp @@ -16,7 +16,7 @@ #include "sessionauthorizer.h" #include "logging.h" -#include "tracepoints.h" // generated from tracepoints.tp +#include "maybe_tracepoints.h" #include <QMetaMethod> #include <QThread> diff --git a/src/platforms/mirserver/sessionlistener.cpp b/src/platforms/mirserver/sessionlistener.cpp index 39118d6..2f97373 100644 --- a/src/platforms/mirserver/sessionlistener.cpp +++ b/src/platforms/mirserver/sessionlistener.cpp @@ -17,7 +17,7 @@ #include "sessionlistener.h" #include "surfaceobserver.h" #include "logging.h" -#include "tracepoints.h" // generated from tracepoints.tp +#include "maybe_tracepoints.h" #include <mir/scene/surface.h> |