diff options
Diffstat (limited to 'tests/auto')
9 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 0f60d6c7db5..3b59a9cce8b 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -90,7 +90,8 @@ static bool generateEnvironmentSettings(Utils::Environment &env, // if Creator is launched within a session set up by setenv.cmd. env.unset("ORIGINALPATH"); run.setEnvironment(env); - const QString cmdPath = QString::fromLocal8Bit(qgetenv("COMSPEC")); + const Utils::FilePath cmdPath + = Utils::FilePath::fromString(QString::fromLocal8Bit(qgetenv("COMSPEC"))); // Windows SDK setup scripts require command line switches for environment expansion. QString cmdArguments = " /E:ON /V:ON /c \"" + QDir::toNativeSeparators(saver.fileName()) + '"'; run.setCommand(Utils::CommandLine(cmdPath, cmdArguments)); diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt index b5d95b8c91e..0d3e8e38584 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt @@ -3,4 +3,5 @@ add_qtc_plugin(plugin1 SOURCES plugin1.cpp plugin1.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt index bb862240ea2..fd58e173c23 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt @@ -3,4 +3,5 @@ add_qtc_plugin(plugin2 SOURCES plugin2.cpp plugin2.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt index 211ce4ab30d..dec94785f10 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt @@ -3,4 +3,5 @@ add_qtc_plugin(plugin3 SOURCES plugin3.cpp plugin3.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt index 737cf2a9f71..6302992c2a8 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_plugin(correct_plugin1 SOURCES plugin1.cpp plugin1.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt index 9a366d4b03d..075a08e58d9 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_plugin(correct_plugin2 SOURCES plugin2.cpp plugin2.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt index 8564a2a21d2..2326ac08b42 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_plugin(correct_plugin3 SOURCES plugin3.cpp plugin3.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt index 2a01133532a..df9fe192440 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt @@ -15,6 +15,7 @@ add_qtc_plugin(testplugin PLUGIN_PATH "${CMAKE_CURRENT_BINARY_DIR}" PROPERTIES OUTPUT_NAME ${plugin_output_name} + SKIP_INSTALL ) # The empty string gets removed if I put it above diff --git a/tests/auto/ssh/tst_ssh.cpp b/tests/auto/ssh/tst_ssh.cpp index 22e7062fdee..5ce94b74623 100644 --- a/tests/auto/ssh/tst_ssh.cpp +++ b/tests/auto/ssh/tst_ssh.cpp @@ -313,8 +313,7 @@ void tst_Ssh::remoteProcessInput() SshConnection connection(params); QVERIFY(waitForConnection(connection)); - SshRemoteProcessPtr catProcess - = connection.createRemoteProcess(QString::fromLatin1("/bin/cat").toUtf8()); + SshRemoteProcessPtr catProcess = connection.createRemoteProcess("/bin/cat"); QEventLoop loop; connect(catProcess.get(), &SshRemoteProcess::started, &loop, &QEventLoop::quit); connect(catProcess.get(), &SshRemoteProcess::done, &loop, &QEventLoop::quit); |