Merge remote-tracking branch 'origin/4.10'

Change-Id: I427280fdb207b878000697dfd37595ffdb26f4e7
2019-07-26 10:30:03 +02:00
parent eab0df22f9 2e556c96b6
commit 3ab3e68a7b
61 changed files with 877 additions and 714 deletions
--- a/src/libs/tracing/CMakeLists.txt
+++ b/src/libs/tracing/CMakeLists.txt
@@ -6,7 +6,6 @@ endif()

 add_qtc_library(Tracing
  DEPENDS Utils Qt5::Qml Qt5::Quick
-  PUBLIC_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}"
  SOURCES ${TEST_SOURCES}
    flamegraph.cpp flamegraph.h
    flamegraphattached.h