diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs index 0cccb89269c..99beea8dc65 100644 --- a/src/libs/libs.qbs +++ b/src/libs/libs.qbs @@ -15,6 +15,7 @@ Project { "languageserverprotocol/languageserverprotocol.qbs", "languageutils/languageutils.qbs", "modelinglib/modelinglib.qbs", + "nanotrace/nanotrace.qbs", "qmleditorwidgets/qmleditorwidgets.qbs", "qmljs/qmljs.qbs", "qmldebug/qmldebug.qbs", diff --git a/src/libs/nanotrace/nanotrace.qbs b/src/libs/nanotrace/nanotrace.qbs new file mode 100644 index 00000000000..388bfb20f87 --- /dev/null +++ b/src/libs/nanotrace/nanotrace.qbs @@ -0,0 +1,16 @@ +QtcLibrary { + name: "Nanotrace" + + cpp.defines: base.concat("NANOTRACE_LIBRARY", "NANOTRACE_ENABLED") + cpp.visibility: "default" + + files: [ + "nanotrace.cpp", + "nanotrace.h", + ] + + Export { + Depends { name: "cpp" } + cpp.defines: "NANOTRACE_ENABLED" + } +} diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 776f9b2be3a..ff16d0de7e3 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -15,6 +15,7 @@ Project { } Depends { name: "AdvancedDockingSystem" } Depends { name: "Core" } + Depends { name: "Nanotrace"; required: false } Depends { name: "QmlJS" } Depends { name: "QmlEditorWidgets" } Depends { name: "TextEditor" } @@ -154,6 +155,8 @@ Project { "commands/endpuppetcommand.h", "commands/informationchangedcommand.cpp", "commands/informationchangedcommand.h", + "commands/nanotracecommand.cpp", + "commands/nanotracecommand.h", "commands/pixmapchangedcommand.cpp", "commands/pixmapchangedcommand.h", "commands/puppetalivecommand.cpp", diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 9f90a0e29a0..f51dd11b753 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -6,6 +6,7 @@ QtcTool { installDir: qbs.targetOS.contains("macos") ? qtc.ide_libexec_path + "/qmldesigner" : qtc.ide_libexec_path + Depends { name: "Nanotrace"; required: false } Depends { name: "Utils" } Depends { name: "bundle" } Depends { @@ -88,6 +89,8 @@ QtcTool { "commands/endpuppetcommand.h", "commands/informationchangedcommand.cpp", "commands/informationchangedcommand.h", + "commands/nanotracecommand.cpp", + "commands/nanotracecommand.h", "commands/pixmapchangedcommand.cpp", "commands/pixmapchangedcommand.h", "commands/puppetalivecommand.cpp",