diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 094cbe7c70d..dcf51ff0a2e 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -15,7 +15,6 @@ add_subdirectory(mapreduce) add_subdirectory(pointeralgorithm) add_subdirectory(profilewriter) add_subdirectory(qml) -add_subdirectory(qtcprocess) add_subdirectory(runextensions) add_subdirectory(sdktool) add_subdirectory(ssh) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d68d3ed43f9..c5020a5e6de 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -15,7 +15,6 @@ SUBDIRS += \ ssh \ treeviewfind \ toolchaincache \ - qtcprocess \ json \ utils \ filesearch \ diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs index 895f7d8da85..c82d1df0941 100644 --- a/tests/auto/auto.qbs +++ b/tests/auto/auto.qbs @@ -18,7 +18,6 @@ Project { "languageserverprotocol/languageserverprotocol.qbs", "profilewriter/profilewriter.qbs", "qml/qml.qbs", - "qtcprocess/qtcprocess.qbs", "runextensions/runextensions.qbs", "sdktool/sdktool.qbs", "ssh/ssh.qbs", diff --git a/tests/auto/utils/CMakeLists.txt b/tests/auto/utils/CMakeLists.txt index 1b96a980f07..4b341d6b3c1 100644 --- a/tests/auto/utils/CMakeLists.txt +++ b/tests/auto/utils/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(ansiescapecodehandler) add_subdirectory(fileutils) add_subdirectory(fuzzymatcher) add_subdirectory(persistentsettings) +add_subdirectory(qtcprocess) add_subdirectory(settings) add_subdirectory(stringutils) add_subdirectory(templateengine) diff --git a/tests/auto/qtcprocess/CMakeLists.txt b/tests/auto/utils/qtcprocess/CMakeLists.txt similarity index 100% rename from tests/auto/qtcprocess/CMakeLists.txt rename to tests/auto/utils/qtcprocess/CMakeLists.txt diff --git a/tests/auto/qtcprocess/qtcprocess.pro b/tests/auto/utils/qtcprocess/qtcprocess.pro similarity index 79% rename from tests/auto/qtcprocess/qtcprocess.pro rename to tests/auto/utils/qtcprocess/qtcprocess.pro index 8b7db5493e6..ed61fd10d0a 100644 --- a/tests/auto/qtcprocess/qtcprocess.pro +++ b/tests/auto/utils/qtcprocess/qtcprocess.pro @@ -1,5 +1,5 @@ QTC_LIB_DEPENDS += utils -include(../qttest.pri) +include(../../qttest.pri) win32:DEFINES += _CRT_SECURE_NO_WARNINGS diff --git a/tests/auto/qtcprocess/qtcprocess.qbs b/tests/auto/utils/qtcprocess/qtcprocess.qbs similarity index 100% rename from tests/auto/qtcprocess/qtcprocess.qbs rename to tests/auto/utils/qtcprocess/qtcprocess.qbs diff --git a/tests/auto/qtcprocess/tst_qtcprocess.cpp b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp similarity index 100% rename from tests/auto/qtcprocess/tst_qtcprocess.cpp rename to tests/auto/utils/qtcprocess/tst_qtcprocess.cpp diff --git a/tests/auto/utils/utils.pro b/tests/auto/utils/utils.pro index 1a96edbfa04..2e15c4379ed 100644 --- a/tests/auto/utils/utils.pro +++ b/tests/auto/utils/utils.pro @@ -5,6 +5,7 @@ SUBDIRS = \ ansiescapecodehandler \ fuzzymatcher \ persistentsettings \ + qtcprocess \ settings \ stringutils \ templateengine \ diff --git a/tests/auto/utils/utils.qbs b/tests/auto/utils/utils.qbs index e3e136305ad..5b11f46e7bc 100644 --- a/tests/auto/utils/utils.qbs +++ b/tests/auto/utils/utils.qbs @@ -7,6 +7,7 @@ Project { "ansiescapecodehandler/ansiescapecodehandler.qbs", "fuzzymatcher/fuzzymatcher.qbs", "persistentsettings/persistentsettings.qbs", + "qtcprocess/qtcprocess.qbs", "settings/settings.qbs", "stringutils/stringutils.qbs", "templateengine/templateengine.qbs",