diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-28 16:05:38 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-28 16:05:18 +0000 |
| commit | 202aa06d7c560c2cceb0a7f18aa2189a22358d52 (patch) | |
| tree | 05be04791b9e1dcaabd3bc96d7af74419c7b1cb8 /src/plugins/clangtools | |
| parent | 5e4f6a9bb3138c8e48badda6b2a109cb5fa2bd41 (diff) | |
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>
Diffstat (limited to 'src/plugins/clangtools')
| -rw-r--r-- | src/plugins/clangtools/clangtoolsunittests.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/clangtools/clangtoolsunittests.qrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp index cd20781c172..446bbf8de3f 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 def5ee3437e..598de3e3671 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> |