forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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());
|
||||
}
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -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());
|
||||
}
|
||||
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user