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

CMakeProjectManager: Add lib and app binaries to project tree

Browse Source 
Task-number: QTCREATORBUG-28815
Change-Id: I58ebcd2a6935eb4b6746b5fd58e6ab8b97fdef43
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2023-03-20 12:32:37 +01:00
parent 80fa3339e0
commit 65814b124c
4 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/project.cpp
View File

@@ -11,6 +11,7 @@
#include "environmentaspect.h"
#include "kit.h"
#include "kitinformation.h"
#include "msvctoolchain.h"
#include "projectexplorer.h"
#include "projectexplorerconstants.h"
#include "projectexplorertr.h"
@@ -20,6 +21,7 @@
#include "runconfigurationaspects.h"
#include "target.h"
#include "taskhub.h"
#include "toolchainmanager.h"
#include "userfileaccessor.h"
#include <coreplugin/idocument.h>
@@ -1514,10 +1516,20 @@ void ProjectExplorerPlugin::testSourceToBinaryMapping()
{
// Find suitable kit.
Kit * const kit = findOr(KitManager::kits(), nullptr, [](const Kit *k) {
return k->isValid();
return k->isValid() && ToolChainKitAspect::cxxToolChain(k);
});
if (!kit)
QSKIP("The test requires at least one valid kit.");
QSKIP("The test requires at least one kit with a toolchain.");
const auto toolchain = ToolChainKitAspect::cxxToolChain(kit);
QVERIFY(toolchain);
if (const auto msvcToolchain = dynamic_cast<Internal::MsvcToolChain *>(toolchain)) {
while (!msvcToolchain->environmentInitialized()) {
QSignalSpy parsingFinishedSpy(ToolChainManager::instance(),
&ToolChainManager::toolChainUpdated);
QVERIFY(parsingFinishedSpy.wait(10000));
}
}
// Copy project from qrc.
QTemporaryDir * const tempDir = TemporaryDirectory::masterTemporaryDirectory();
@@ -1569,7 +1581,6 @@ void ProjectExplorerPlugin::testSourceToBinaryMapping()
const auto binariesForSource = [&](const QString &fileName) {
return theProject.project()->binariesForSourceFile(projectDir.pathAppended(fileName));
};
QEXPECT_FAIL("cmake", "QTCREATORBUG-28815", Abort);
QCOMPARE(binariesForSource("multi-target-project-main.cpp").size(), 1);
QCOMPARE(binariesForSource("multi-target-project-lib.cpp").size(), 1);
QCOMPARE(binariesForSource("multi-target-project-shared.h").size(), 2);