feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTools/Debugger: Fix resource name clash

Browse Source 
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>
This commit is contained in:
Nikolai Kosjar
2019-11-28 16:05:38 +01:00
parent 5e4f6a9bb3
commit 202aa06d7c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangtools/clangtoolsunittests.cpp
View File

@@ -70,7 +70,7 @@ void ClangToolsUnitTests::initTestCase()
if (Core::ICore::clangExecutable(CLANG_BINDIR).isEmpty()) if (Core::ICore::clangExecutable(CLANG_BINDIR).isEmpty())
QSKIP("No clang suitable for analyzing found"); 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()); QVERIFY(m_tmpDir->isValid());
} }

2
src/plugins/clangtools/clangtoolsunittests.qrc
View File

@@ -1,5 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/clangtools">
<file>unit-tests/simple/main.cpp</file> <file>unit-tests/simple/main.cpp</file>
<file>unit-tests/simple/simple.qbs</file> <file>unit-tests/simple/simple.qbs</file>
<file>unit-tests/simple/simple.pro</file> <file>unit-tests/simple/simple.pro</file>

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2350,7 +2350,7 @@ void DebuggerUnitTests::initTestCase()
// QSKIP("No clang suitable for analyzing found"); // QSKIP("No clang suitable for analyzing found");
s_testRun = true; s_testRun = true;
m_tmpDir = new CppTools::Tests::TemporaryCopiedDir(":/unit-tests"); m_tmpDir = new CppTools::Tests::TemporaryCopiedDir(":/debugger/unit-tests");
QVERIFY(m_tmpDir->isValid()); QVERIFY(m_tmpDir->isValid());
} }

2
src/plugins/debugger/debuggerunittests.qrc
View File

@@ -1,5 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/debugger">
<file>unit-tests/simple/main.cpp</file> <file>unit-tests/simple/main.cpp</file>
<file>unit-tests/simple/simple.pro</file> <file>unit-tests/simple/simple.pro</file>
</qresource> </qresource>