summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2019-11-28 16:05:38 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2019-11-28 16:05:18 +0000
commit202aa06d7c560c2cceb0a7f18aa2189a22358d52 (patch)
tree05be04791b9e1dcaabd3bc96d7af74419c7b1cb8
parent5e4f6a9bb3138c8e48badda6b2a109cb5fa2bd41 (diff)
downloadqt-creator-202aa06d7c560c2cceb0a7f18aa2189a22358d52.tar.gz
ClangTools/Debugger: Fix resource name clash
The two plugins plugins added resource files which were referenced with the same name, namely :/unit-tests Make the names unique. Change-Id: If63e762663f3f61b15f826d76ffcd2eb66873db7 Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/plugins/clangtools/clangtoolsunittests.cpp2
-rw-r--r--src/plugins/clangtools/clangtoolsunittests.qrc2
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp2
-rw-r--r--src/plugins/debugger/debuggerunittests.qrc2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp
index cd20781c17..446bbf8de3 100644
--- a/src/plugins/clangtools/clangtoolsunittests.cpp
+++ b/src/plugins/clangtools/clangtoolsunittests.cpp
@@ -70,7 +70,7 @@ void ClangToolsUnitTests::initTestCase()
if (Core::ICore::clangExecutable(CLANG_BINDIR).isEmpty())
QSKIP("No clang suitable for analyzing found");
- m_tmpDir = new Tests::TemporaryCopiedDir(QLatin1String(":/unit-tests"));
+ m_tmpDir = new Tests::TemporaryCopiedDir(":/clangtools/unit-tests");
QVERIFY(m_tmpDir->isValid());
}
diff --git a/src/plugins/clangtools/clangtoolsunittests.qrc b/src/plugins/clangtools/clangtoolsunittests.qrc
index def5ee3437..598de3e367 100644
--- a/src/plugins/clangtools/clangtoolsunittests.qrc
+++ b/src/plugins/clangtools/clangtoolsunittests.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/">
+ <qresource prefix="/clangtools">
<file>unit-tests/simple/main.cpp</file>
<file>unit-tests/simple/simple.qbs</file>
<file>unit-tests/simple/simple.pro</file>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index cdbe82a7a5..5058ef0cbc 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2350,7 +2350,7 @@ void DebuggerUnitTests::initTestCase()
// QSKIP("No clang suitable for analyzing found");
s_testRun = true;
- m_tmpDir = new CppTools::Tests::TemporaryCopiedDir(":/unit-tests");
+ m_tmpDir = new CppTools::Tests::TemporaryCopiedDir(":/debugger/unit-tests");
QVERIFY(m_tmpDir->isValid());
}
diff --git a/src/plugins/debugger/debuggerunittests.qrc b/src/plugins/debugger/debuggerunittests.qrc
index 42d52705a8..d00ec930f5 100644
--- a/src/plugins/debugger/debuggerunittests.qrc
+++ b/src/plugins/debugger/debuggerunittests.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/">
+ <qresource prefix="/debugger">
<file>unit-tests/simple/main.cpp</file>
<file>unit-tests/simple/simple.pro</file>
</qresource>