From 42c68ad7b51a809e25c8493c221a7ca730c9539d Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 9 Mar 2017 12:46:34 +0100 Subject: [PATCH] Debugger: Remove libUtils dependency from some tests libUtils nowadays depends on Qt Declarative, which is not necessarily present in pure test setups. Change-Id: I8c40d086186ccf047c034345126f088f53652dbb Reviewed-by: Christian Stenger --- src/plugins/debugger/disassemblerlines.cpp | 1 - tests/auto/debugger/disassembler.pro | 1 - tests/auto/debugger/disassembler.qbs | 2 -- tests/auto/debugger/gdb.pro | 3 ++- tests/auto/debugger/namedemangler.pro | 1 - tests/auto/debugger/simplifytypes.pro | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/disassemblerlines.cpp b/src/plugins/debugger/disassemblerlines.cpp index 16fa277f764..661d331a858 100644 --- a/src/plugins/debugger/disassemblerlines.cpp +++ b/src/plugins/debugger/disassemblerlines.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "disassemblerlines.h" -#include "debuggerengine.h" #include "sourceutils.h" #include diff --git a/tests/auto/debugger/disassembler.pro b/tests/auto/debugger/disassembler.pro index c42b8e047dd..2a145964eac 100644 --- a/tests/auto/debugger/disassembler.pro +++ b/tests/auto/debugger/disassembler.pro @@ -1,4 +1,3 @@ -QTC_LIB_DEPENDS += utils QT = core network widgets include(../qttest.pri) diff --git a/tests/auto/debugger/disassembler.qbs b/tests/auto/debugger/disassembler.qbs index 35a5aadd596..4d23156527d 100644 --- a/tests/auto/debugger/disassembler.qbs +++ b/tests/auto/debugger/disassembler.qbs @@ -2,8 +2,6 @@ import qbs QtcAutotest { name: "disassembler autotest" - Depends { name: "ProjectExplorer" } - Depends { name: "QtcSsh" } Group { name: "Sources from Debugger plugin" prefix: project.debuggerDir diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro index 9cd6e1c4752..5b1b3627bfa 100644 --- a/tests/auto/debugger/gdb.pro +++ b/tests/auto/debugger/gdb.pro @@ -1,12 +1,13 @@ -QTC_LIB_DEPENDS += utils QT = core network include(../qttest.pri) DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger +UTILSDIR = $$IDE_SOURCE_TREE/src/libs/utils INCLUDEPATH += $$DEBUGGERDIR SOURCES += \ tst_gdb.cpp \ $$DEBUGGERDIR/debuggerprotocol.cpp \ + $$UTILSDIR/processhandle.cpp diff --git a/tests/auto/debugger/namedemangler.pro b/tests/auto/debugger/namedemangler.pro index ec021e6eb80..241e1e2759b 100644 --- a/tests/auto/debugger/namedemangler.pro +++ b/tests/auto/debugger/namedemangler.pro @@ -1,4 +1,3 @@ -QTC_LIB_DEPENDS += utils QT -= gui include(../qttest.pri) diff --git a/tests/auto/debugger/simplifytypes.pro b/tests/auto/debugger/simplifytypes.pro index df645f15131..7e15fecad39 100644 --- a/tests/auto/debugger/simplifytypes.pro +++ b/tests/auto/debugger/simplifytypes.pro @@ -1,4 +1,3 @@ -QTC_LIB_DEPENDS += utils include(../qttest.pri) QT += network QT -= gui widgets