feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
b6a766669751ec71cfdb026ad3dbd3b8d8be1c4e
qt-creator/src/plugins/qmakeprojectmanager/qmakeparsernodes.h

386 lines
13 KiB
C
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-19 15:59:36 +02:00
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
#pragma once
#include "qmakeprojectmanager_global.h"
#include "proparser/prowriter.h"
#include "proparser/profileevaluator.h"
#include <coreplugin/idocument.h>
Merge CppTools into CppEditor There was no proper separation of responsibilities between these plugins. In particular, CppTools had lots of editor-related functionality, so it's not clear why it was separated out in the first place. In fact, for a lot of code, it seemed quite arbitrary where it was put (just one example: switchHeaderSource() was in CppTools, wheras switchDeclarationDefinition() was in CppEditor). Merging the plugins will enable us to get rid of various convoluted pseudo-abstractions that were only introduced to keep up the artificial separation. Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-30 10:58:08 +02:00
#include <cppeditor/generatedcodemodelsupport.h>
QmakeProjectManager: Preserve line endings ... when adding and removing files via the project tree. Fixes: QTCREATORBUG-2196 Change-Id: Ie4ee3a244c9089953cf414d9777fc65b6a8b9689 Reviewed-by: David Schulz <david.schulz@qt.io>
2019-07-24 16:04:09 +02:00
#include <utils/textfileformat.h>
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
#include <QFutureWatcher>
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
#include <QHash>
Qmake: Add some debug output for file add/remove operations This will help collecting feedback from users affected by bugs. Task-number: QTCREATORBUG-22508 Change-Id: Idfc22245587dd2d71b229b4ab6c7562fb7a5ecfc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-11 14:01:35 +01:00
#include <QLoggingCategory>
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
#include <QMap>
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
#include <QPair>
#include <QStringList>
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: QmakeParserPriFileNode: Use unique_ptr Use unique_ptr to hold the QmakePriFileDocument. That makes it clearer that QmakePriFileNode owns it. Change-Id: Ia31778ad2a9d33a13cf818d3bcad0485ebfa2043 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-09 15:09:25 +01:00
#include <memory>
ProjectExplorer: Make communication between target and selector direct Architecture-wise, this now means that Target knows about the MiniProjectTargetSelector, otoh, Project does less, and quite a bit of signal, slot and qobject_cast is gone. Change-Id: I0feef9328144282c7c4ca710a12ac0e495810684 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-18 15:55:26 +01:00
namespace ProjectExplorer { class BuildConfiguration; }
QmakeProjectManager: Watch wildcard directories for changes If e.g. DISTFILES contains wildcards, watch the directory for changes. Fixes: QTCREATORBUG-21603 Change-Id: Ia6e8c94ab7b74e0404776ba1d7d9b10eb3b643de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-30 10:31:56 +02:00
namespace Utils {
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
class FilePath;
QmakeProjectManager: Watch wildcard directories for changes If e.g. DISTFILES contains wildcards, watch the directory for changes. Fixes: QTCREATORBUG-21603 Change-Id: Ia6e8c94ab7b74e0404776ba1d7d9b10eb3b643de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-30 10:31:56 +02:00
class FileSystemWatcher;
} // namespace Utils;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
namespace QtSupport { class ProFileReader; }
namespace QmakeProjectManager {
ProjectExplorer: Move BuildSystem owership to BuildConfiguration ... or Target. This patch moves build system from conceptually "one per project" to "one per target (i.e. per project-and-kit)" or "per BuildConfigurations" for targets where the builds differ significantly. Building requires usually items from the kit (Qt version, compiler, ...) so a target-agnostic build is practically almost always wrong. Moving the build system to the target also has the potential to solve issues caused by switching targets while parsing, that used Project::activeTarget() regularly, with potentially different results before and after the switch. This patch might create performance/size regressions when several targets are set up per project as the build system implementation's internal data are duplicated in this case. The idea is to fix that by sharing per-project pieces again in the project implementation once these problems occur. Change-Id: I87f640ce418b93175b5029124eaa55f3b8721dca Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-25 09:55:32 +02:00
class QmakeBuildSystem;
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
class QmakeProFile;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
class QmakeProject;
// Type of projects
enum class ProjectType {
Invalid = 0,
ApplicationTemplate,
StaticLibraryTemplate,
SharedLibraryTemplate,
ScriptTemplate,
AuxTemplate,
SubDirsTemplate
};
// Other variables of interest
enum class Variable {
Defines = 1,
IncludePath,
CppFlags,
Qmake: Pass on QMAKE_CFLAGS to the code model Change-Id: I87c07177adcfd72c7852f84266feb9baf1f87e5b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-11-03 12:26:21 +01:00
CFlags,
ClangTools/QMake: Stop analyzing files not part of build configuration ...for the qmake project manager. When parsing the project files, remember whether a file was discovered by the exact or cumulative parse. Only files that were discovered by the exact parse are considered "active" and thus part of the build configuration. The others are not offered for selection. Fixes: QTCREATORBUG-16016 Started-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I7a28b4de15e048975d7f0cd737dd8c11f744315b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-01-04 09:07:55 +01:00
ExactSource,
CumulativeSource,
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
ExactResource,
CumulativeResource,
UiDir,
HeaderExtension,
CppExtension,
MocDir,
PkgConfig,
PrecompiledHeader,
LibDirectories,
Config,
Qt,
QmlImportPath,
QmlDesignerImportPath,
Makefile,
ObjectExt,
ObjectsDir,
Version,
TargetExt,
TargetVersionExt,
StaticLibExtension,
ShLibExtension,
Android: Clean up for extraData constants clean, rename and delete unused constants, we well as unify the usage between qmake, cmake, and qbs. Change-Id: I8827ac2f2f7660e337694fef17f744e727bd776a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-05 18:49:26 +03:00
AndroidAbi,
Android: Warn if the selected device main ABI is not selected Task-number: QTCREATORBUG-23291 Change-Id: I2ae13edaee30c6548a37e077c18f508a42b42d25 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-14 15:23:26 +03:00
AndroidAbis,
Android: Clean up for extraData constants clean, rename and delete unused constants, we well as unify the usage between qmake, cmake, and qbs. Change-Id: I8827ac2f2f7660e337694fef17f744e727bd776a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-05 18:49:26 +03:00
AndroidDeploySettingsFile,
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
AndroidPackageSourceDir,
AndroidExtraLibs,
Android: Clean up for extraData constants clean, rename and delete unused constants, we well as unify the usage between qmake, cmake, and qbs. Change-Id: I8827ac2f2f7660e337694fef17f744e727bd776a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-05 18:49:26 +03:00
AndroidApplicationArgs,
Qmake: Parse two AppMan specific variables Effectively the same approach as for Android, but a bit more ugly as we don't have necessarily access to the appman plugin headers even at compile time. Change-Id: I6d00e69b593470e059a16a1fcf6b57bdd550ae40 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-14 15:02:47 +01:00
AppmanPackageDir,
AppmanManifest,
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
IsoIcons,
QmakeProjectName,
QmakeCc,
QmakeCxx
};
Utils: Collapse most of porting,h Taking the Qt 6 branches, leaving some dummies until downstream adapted. Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-13 09:27:18 +02:00
size_t qHash(Variable key, uint seed = 0);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
namespace Internal {
Qmake: Add some debug output for file add/remove operations This will help collecting feedback from users affected by bugs. Task-number: QTCREATORBUG-22508 Change-Id: Idfc22245587dd2d71b229b4ab6c7562fb7a5ecfc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-11 14:01:35 +01:00
Q_DECLARE_LOGGING_CATEGORY(qmakeNodesLog)
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
class QmakeEvalInput;
class QmakeEvalResult;
QmakeProjectManager: Do not leak QmakeEvalResults Fixes: QTCREATORBUG-26326 Change-Id: I2a4abf86e9dd607bf7a0bf0843b0c9bff943d704 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-21 12:15:57 +02:00
using QmakeEvalResultPtr = std::shared_ptr<QmakeEvalResult>; // FIXME: Use unique_ptr once we require Qt 6
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
class QmakePriFileEvalResult;
qmake: Remove InternalParserNode again The parser nodes do not need to represent the actual project tree, so there is no need to keep the tree-structure. Store the list of files instead. Change-Id: I83e036d4b9b42e4186b4ef23ac573865942ee97e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 15:43:06 +01:00
} // namespace Internal;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
class InstallsList;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
enum class FileOrigin { ExactParse, CumulativeParse };
Utils: Collapse most of porting,h Taking the Qt 6 branches, leaving some dummies until downstream adapted. Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-13 09:27:18 +02:00
size_t qHash(FileOrigin fo);
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
using SourceFile = QPair<Utils::FilePath, FileOrigin>;
using SourceFiles = QSet<SourceFile>;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
// Implements ProjectNode for qmake .pri files
qmake: QmakePriFile is no longer a ProjectNode Change-Id: Ife3ca88e0d4e0a9de290b2b991ac8d10e3c55674 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 09:56:33 +01:00
class QMAKEPROJECTMANAGER_EXPORT QmakePriFile
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
{
public:
ProjectExplorer: Move BuildSystem owership to BuildConfiguration ... or Target. This patch moves build system from conceptually "one per project" to "one per target (i.e. per project-and-kit)" or "per BuildConfigurations" for targets where the builds differ significantly. Building requires usually items from the kit (Qt version, compiler, ...) so a target-agnostic build is practically almost always wrong. Moving the build system to the target also has the potential to solve issues caused by switching targets while parsing, that used Project::activeTarget() regularly, with potentially different results before and after the switch. This patch might create performance/size regressions when several targets are set up per project as the build system implementation's internal data are duplicated in this case. The idea is to fix that by sharing per-project pieces again in the project implementation once these problems occur. Change-Id: I87f640ce418b93175b5029124eaa55f3b8721dca Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-25 09:55:32 +02:00
QmakePriFile(QmakeBuildSystem *buildSystem, QmakeProFile *qmakeProFile, const Utils::FilePath &filePath);
QMakeProjectManager: Move some parsing code out of the UI thread When parsing larger qmake project, the callbacks from the parser threads are currently overloading the UI thread, often rendering the application non-responsive until the project is completely loaded. This patch moves some expensive operations from the UI thread into the parser threads, at the cost of a somewhat ugly two-stage setup for some types of objects. On my Linux machine, I measured that the time spent in parser callback code went down by almost 50% when loading the Qt Creator super project. Task-number: QTCREATORBUG-18533 Change-Id: If9624da5b07e81a50c180693580b20a70e1aaea7 Reviewed-by: hjk <hjk@qt.io>
2020-01-31 15:52:20 +01:00
explicit QmakePriFile(const Utils::FilePath &filePath);
qmake: QmakePriFile is no longer a ProjectNode Change-Id: Ife3ca88e0d4e0a9de290b2b991ac8d10e3c55674 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 09:56:33 +01:00
virtual ~QmakePriFile();
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QMakeProjectManager: Move some parsing code out of the UI thread When parsing larger qmake project, the callbacks from the parser threads are currently overloading the UI thread, often rendering the application non-responsive until the project is completely loaded. This patch moves some expensive operations from the UI thread into the parser threads, at the cost of a somewhat ugly two-stage setup for some types of objects. On my Linux machine, I measured that the time spent in parser callback code went down by almost 50% when loading the Qt Creator super project. Task-number: QTCREATORBUG-18533 Change-Id: If9624da5b07e81a50c180693580b20a70e1aaea7 Reviewed-by: hjk <hjk@qt.io>
2020-01-31 15:52:20 +01:00
void finishInitialization(QmakeBuildSystem *buildSystem, QmakeProFile *qmakeProFile);
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
Utils::FilePath filePath() const;
Utils::FilePath directoryPath() const;
qmake: add displayname method to Qmake*File Change-Id: I90e6ef357f050953f51ae9cad4eb1c1d2daf4e5a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:24:32 +01:00
virtual QString displayName() const;
qmake: remove some unnecessary members from QmakeParserPriFileNode Replace them with member functions providing the same information. Change-Id: If65bb99c77df0f80562b4559914f4b81ab17a166 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-09 15:35:19 +01:00
qmake: Introduce tree structure into QmakePriFiles Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 17:02:47 +01:00
QmakePriFile *parent() const;
qmake: add displayname method to Qmake*File Change-Id: I90e6ef357f050953f51ae9cad4eb1c1d2daf4e5a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:24:32 +01:00
QmakeProject *project() const;
QMakeProjectManager: Replace foreach with ranged for loop Change-Id: Ibdb526ac3e0cfbb0568e17c21a1b73f7749a84ed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-30 13:13:35 +02:00
const QVector<QmakePriFile *> children() const;
qmake: Add method to find QmakePriFiles and QmakeProFiles Change-Id: I04a75b94603b5483d5f9eaa827d08415c0a92985 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:24:57 +01:00
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
QmakePriFile *findPriFile(const Utils::FilePath &fileName);
const QmakePriFile *findPriFile(const Utils::FilePath &fileName) const;
qmake: Add method to find QmakePriFiles and QmakeProFiles Change-Id: I04a75b94603b5483d5f9eaa827d08415c0a92985 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:24:57 +01:00
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
bool knowsFile(const Utils::FilePath &filePath) const;
qmake: Add knowsFile() method to QmakePriFile Change-Id: Ib3f0799313afdb141270caa135b208a300078bc5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 14:47:30 +01:00
qmake: QmakePriFile is no longer a ProjectNode Change-Id: Ife3ca88e0d4e0a9de290b2b991ac8d10e3c55674 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 09:56:33 +01:00
void makeEmpty();
qmake: Introduce tree structure into QmakePriFiles Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 17:02:47 +01:00
QmakeProjectManager: Do not ignore files from included .pri files ... when setting up extra compilers. For example, the code model was not able to resolve included ui_*.h files in a project that wasn't built yet, if the respective FORMS declaration came from a .pri file. Fixes: QTCREATORBUG-22395 Change-Id: I75c4b2b38fec209519adb563d579ecd3a17fe042 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-05-06 16:46:03 +02:00
// Files of the specified type declared in this file.
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
SourceFiles files(const ProjectExplorer::FileType &type) const;
qmake: Add accessor for file lists to QmakePriFile Change-Id: I37f9f39eba3bae2376d5349ce597e29fca6cb21f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:52:36 +01:00
QmakeProjectManager: Do not ignore files from included .pri files ... when setting up extra compilers. For example, the code model was not able to resolve included ui_*.h files in a project that wasn't built yet, if the respective FORMS declaration came from a .pri file. Fixes: QTCREATORBUG-22395 Change-Id: I75c4b2b38fec209519adb563d579ecd3a17fe042 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-05-06 16:46:03 +02:00
// Files of the specified type declared in this file and in included .pri files.
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
const QSet<Utils::FilePath> collectFiles(const ProjectExplorer::FileType &type) const;
QmakeProjectManager: Do not ignore files from included .pri files ... when setting up extra compilers. For example, the code model was not able to resolve included ui_*.h files in a project that wasn't built yet, if the respective FORMS declaration came from a .pri file. Fixes: QTCREATORBUG-22395 Change-Id: I75c4b2b38fec209519adb563d579ecd3a17fe042 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-05-06 16:46:03 +02:00
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
void update(const Internal::QmakePriFileEvalResult &result);
ProjectExplorer: Use more FilePaths in ProjectNodes ... and related classes. Change-Id: I50844a0b60e4b0769727b17d5b3d544cd6d10f0d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-09 14:03:54 +02:00
bool canAddSubProject(const Utils::FilePath &proFilePath) const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
ProjectExplorer: Use more FilePaths in ProjectNodes ... and related classes. Change-Id: I50844a0b60e4b0769727b17d5b3d544cd6d10f0d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-09 14:03:54 +02:00
bool addSubProject(const Utils::FilePath &proFile);
bool removeSubProjects(const Utils::FilePath &proFilePath);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
ProjectExplorer: Use FilePaths in project tree nodes Change-Id: I31b15c428d9b962333947b1e32641fd80f61d069 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-14 16:49:42 +02:00
bool addFiles(const Utils::FilePaths &filePaths, Utils::FilePaths *notAdded = nullptr);
bool removeFiles(const Utils::FilePaths &filePaths, Utils::FilePaths *notRemoved = nullptr);
bool deleteFiles(const Utils::FilePaths &filePaths);
Core: filepathify file renaming Change-Id: I3d4f39e34e65cde3df7b7c19570e3a54d0625d53 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-11 14:34:34 +02:00
bool canRenameFile(const Utils::FilePath &oldFilePath, const Utils::FilePath &newFilePath);
bool renameFile(const Utils::FilePath &oldFilePath, const Utils::FilePath &newFilePath);
New class wizard: Add Qt module dependencies, if necessary Provide general infrastrucure and implementation for qmake. Fixes: QTCREATORBUG-16067 Change-Id: I8c6368fe2724c9450dcbc3410b6ca459bbbdc043 Reviewed-by: hjk <hjk@qt.io>
2019-06-18 15:41:27 +02:00
bool addDependencies(const QStringList &dependencies);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
bool setProVariable(const QString &var, const QStringList &values,
const QString &scope = QString(),
int flags = QmakeProjectManager::Internal::ProWriter::ReplaceValues);
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
bool folderChanged(const QString &changedFolder, const QSet<Utils::FilePath> &newFiles);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakeProject: De-virtualize some QmakePriFile functions Some left-over from the time they were nodes. It's not used polymorphically anymore. Change-Id: I98e75eb5378abdf27e4538041b07c09fa1f9fcc5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-12-20 17:48:37 +01:00
bool deploysFolder(const QString &folder) const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
QmakeProFile *proFile() const;
qmake: Update QmakePriFile::subPriFilesExact Change-Id: Ie1db4eb200c2a5d56bbca678dbe007f91aadf04a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 11:21:58 +01:00
QVector<QmakePriFile *> subPriFilesExact() const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
// Set by parent
bool includedInExactParse() const;
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
static QSet<Utils::FilePath> recursiveEnumerate(const QString &folder);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: QmakeParserPriFileNode: Use unique_ptr Use unique_ptr to hold the QmakePriFileDocument. That makes it clearer that QmakePriFileNode owns it. Change-Id: Ia31778ad2a9d33a13cf818d3bcad0485ebfa2043 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-09 15:09:25 +01:00
void scheduleUpdate();
ProjectExplorer: Move BuildSystem owership to BuildConfiguration ... or Target. This patch moves build system from conceptually "one per project" to "one per target (i.e. per project-and-kit)" or "per BuildConfigurations" for targets where the builds differ significantly. Building requires usually items from the kit (Qt version, compiler, ...) so a target-agnostic build is practically almost always wrong. Moving the build system to the target also has the potential to solve issues caused by switching targets while parsing, that used Project::activeTarget() regularly, with potentially different results before and after the switch. This patch might create performance/size regressions when several targets are set up per project as the build system implementation's internal data are duplicated in this case. The idea is to fix that by sharing per-project pieces again in the project implementation once these problems occur. Change-Id: I87f640ce418b93175b5029124eaa55f3b8721dca Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-25 09:55:32 +02:00
QmakeBuildSystem *buildSystem() const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
protected:
void setIncludedInExactParse(bool b);
static QStringList varNames(ProjectExplorer::FileType type, QtSupport::ProFileReader *readerExact);
static QStringList varNamesForRemoving();
static QString varNameForAdding(const QString &mimeType);
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
static QSet<Utils::FilePath> filterFilesProVariables(ProjectExplorer::FileType fileType, const QSet<Utils::FilePath> &files);
static QSet<Utils::FilePath> filterFilesRecursiveEnumerata(ProjectExplorer::FileType fileType, const QSet<Utils::FilePath> &files);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
enum ChangeType {
AddToProFile,
RemoveFromProFile
};
enum class Change { Save, TestOnly };
Core: filepathify file renaming Change-Id: I3d4f39e34e65cde3df7b7c19570e3a54d0625d53 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
2021-06-11 14:34:34 +02:00
bool renameFile(const Utils::FilePath &oldFilePath, const Utils::FilePath &newFilePath, Change mode);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
void changeFiles(const QString &mimeType,
ProjectExplorer: Use FilePaths in project tree nodes Change-Id: I31b15c428d9b962333947b1e32641fd80f61d069 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-14 16:49:42 +02:00
const Utils::FilePaths &filePaths,
Utils::FilePaths *notChanged,
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
ChangeType change,
Change mode = Change::Save);
qmake: Introduce tree structure into QmakePriFiles Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 17:02:47 +01:00
void addChild(QmakePriFile *pf);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: QmakeParserPriFileNode: Use unique_ptr Use unique_ptr to hold the QmakePriFileDocument. That makes it clearer that QmakePriFileNode owns it. Change-Id: Ia31778ad2a9d33a13cf818d3bcad0485ebfa2043 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-09 15:09:25 +01:00
private:
qmake: Introduce tree structure into QmakePriFiles Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 17:02:47 +01:00
void setParent(QmakePriFile *p);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
bool prepareForChange();
static bool ensureWriteableProFile(const QString &file);
QmakeProjectManager: Preserve line endings ... when adding and removing files via the project tree. Fixes: QTCREATORBUG-2196 Change-Id: Ie4ee3a244c9089953cf414d9777fc65b6a8b9689 Reviewed-by: David Schulz <david.schulz@qt.io>
2019-07-24 16:04:09 +02:00
QPair<ProFile *, QStringList> readProFile();
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
static QPair<ProFile *, QStringList> readProFileFromContents(const QString &contents);
void save(const QStringList &lines);
bool saveModifiedEditors();
ProjectExplorer: Use FilePaths in project tree nodes Change-Id: I31b15c428d9b962333947b1e32641fd80f61d069 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-14 16:49:42 +02:00
Utils::FilePaths formResources(const Utils::FilePath &formFile) const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
static QStringList baseVPaths(QtSupport::ProFileReader *reader, const QString &projectDir, const QString &buildDir);
static QStringList fullVPaths(const QStringList &baseVPaths, QtSupport::ProFileReader *reader, const QString &qmakeVariable, const QString &projectDir);
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
static void extractSources(QHash<int, Internal::QmakePriFileEvalResult *> proToResult,
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
Internal::QmakePriFileEvalResult *fallback,
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
QVector<ProFileEvaluator::SourceFile> sourceFiles, ProjectExplorer::FileType type, bool cumulative);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
static void extractInstalls(
qmake: Change source identifier type in ProString The strings remember in which file they were created/assigned. However, this used a non-counting reference to a ProFile, which could become dangling. If a subsequent ProFile re-used the exact same address, a string's source would be mis-identified, which would be fatal in conjunction with discard_from(). Since we actually need only a unique id for comparison, let's use an integer for that. comment on cherry-pick: this is actually a lot more than a cherry-pick, because the file ids need to be aware of the dual VFS which was concurrently introduced on the qtc side. Started-by: Simon Hausmann <simon.hausmann@qt.io> Change-Id: I395153afaf7c835d0119690ee7f4b915e6f90d4a (cherry picked from qtbase/190aa94be7f5e146bef44862b974d733755cec85) Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-14 18:30:29 +02:00
QHash<int, Internal::QmakePriFileEvalResult *> proToResult,
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
Internal::QmakePriFileEvalResult *fallback,
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
const InstallsList &installList);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
static void processValues(Internal::QmakePriFileEvalResult &result);
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
void watchFolders(const QSet<Utils::FilePath> &folders);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakePM: Respect editor settings when adding files to project If the user wants to indent with tabs, then consider that when adding source files via the UI. But try not to mix: If the respective variable already uses a different indentation consistently, then keep using that one. Fixes: QTCREATORBUG-8016 Change-Id: I037c9ac4d4e7fbbe5753a846e57d938bbb440d6a Reviewed-by: David Schulz <david.schulz@qt.io>
2019-02-01 16:50:29 +01:00
QString continuationIndent() const;
ProjectExplorer: Move BuildSystem owership to BuildConfiguration ... or Target. This patch moves build system from conceptually "one per project" to "one per target (i.e. per project-and-kit)" or "per BuildConfigurations" for targets where the builds differ significantly. Building requires usually items from the kit (Qt version, compiler, ...) so a target-agnostic build is practically almost always wrong. Moving the build system to the target also has the potential to solve issues caused by switching targets while parsing, that used Project::activeTarget() regularly, with potentially different results before and after the switch. This patch might create performance/size regressions when several targets are set up per project as the build system implementation's internal data are duplicated in this case. The idea is to fix that by sharing per-project pieces again in the project implementation once these problems occur. Change-Id: I87f640ce418b93175b5029124eaa55f3b8721dca Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-25 09:55:32 +02:00
QPointer<QmakeBuildSystem> m_buildSystem;
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
QmakeProFile *m_qmakeProFile = nullptr;
qmake: Introduce tree structure into QmakePriFiles Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 17:02:47 +01:00
QmakePriFile *m_parent = nullptr;
QVector<QmakePriFile *> m_children;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakeProjectManager: Preserve line endings ... when adding and removing files via the project tree. Fixes: QTCREATORBUG-2196 Change-Id: Ie4ee3a244c9089953cf414d9777fc65b6a8b9689 Reviewed-by: David Schulz <david.schulz@qt.io>
2019-07-24 16:04:09 +02:00
Utils::TextFileFormat m_textFormat;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
// Memory is cheap...
QmakeProjectManager: Mark disabled source files in project tree We show all source files in the project tree, including those which are listed in scopes that evaluate to false in the current configuration. This is intended, as we want users to be able to navigate to all files, not just the ones that are part of the build for the current target. However, it'd be nice for users to be able to tell which files are "active" and which ones are not. Therefore, we now mark the non-active ones as "disabled" in the project tree, just like the QbsProjectManager does. Task-number: QTCREATORBUG-22855 Change-Id: Icfb48d4f6a247de76fc109acb84b34f03866e754 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-08-20 14:48:48 +02:00
QMap<ProjectExplorer::FileType, SourceFiles> m_files;
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
QSet<Utils::FilePath> m_recursiveEnumerateFiles; // FIXME: Remove this?!
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QSet<QString> m_watchedFolders;
QMakeProjectManager: Move some parsing code out of the UI thread When parsing larger qmake project, the callbacks from the parser threads are currently overloading the UI thread, often rendering the application non-responsive until the project is completely loaded. This patch moves some expensive operations from the UI thread into the parser threads, at the cost of a somewhat ugly two-stage setup for some types of objects. On my Linux machine, I measured that the time spent in parser callback code went down by almost 50% when loading the Qt Creator super project. Task-number: QTCREATORBUG-18533 Change-Id: If9624da5b07e81a50c180693580b20a70e1aaea7 Reviewed-by: hjk <hjk@qt.io>
2020-01-31 15:52:20 +01:00
const Utils::FilePath m_filePath;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
bool m_includedInExactParse = true;
qmake: move over from QmakeProjectNodes to QmakeParserNodes Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 11:16:18 +01:00
friend class QmakeProFile;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
};
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
class QMAKEPROJECTMANAGER_EXPORT TargetInformation
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
{
public:
bool valid = false;
QString target;
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
Utils::FilePath destDir;
Utils::FilePath buildDir;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QString buildTarget;
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
bool operator==(const TargetInformation &other) const
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
{
return target == other.target
&& valid == other.valid
&& destDir == other.destDir
&& buildDir == other.buildDir
&& buildTarget == other.buildTarget;
}
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
bool operator!=(const TargetInformation &other) const
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
{
return !(*this == other);
}
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
TargetInformation() = default;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
};
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
class QMAKEPROJECTMANAGER_EXPORT InstallsItem {
qmake: use class instead of struct Change-Id: Ieb0d7557555c4a0c2e196b28841972483f3fd135 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 23:30:14 +01:00
public:
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
InstallsItem() = default;
QmakeProjectManager: Take "executable" CONFIG value into account ... when setting up deployment data. Fixes: QTCREATORBUG-22663 Change-Id: I88c428177b76a7bb59fc884c0b727fd0f26a780f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-07-04 11:30:56 +02:00
InstallsItem(QString p, QVector<ProFileEvaluator::SourceFile> f, bool a, bool e)
: path(p), files(f), active(a), executable(e) {}
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QString path;
QVector<ProFileEvaluator::SourceFile> files;
bool active = false;
QmakeProjectManager: Take "executable" CONFIG value into account ... when setting up deployment data. Fixes: QTCREATORBUG-22663 Change-Id: I88c428177b76a7bb59fc884c0b727fd0f26a780f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-07-04 11:30:56 +02:00
bool executable = false;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
};
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
class QMAKEPROJECTMANAGER_EXPORT InstallsList {
qmake: use class instead of struct Change-Id: Ieb0d7557555c4a0c2e196b28841972483f3fd135 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 23:30:14 +01:00
public:
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
void clear() { targetPath.clear(); items.clear(); }
QString targetPath;
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
QVector<InstallsItem> items;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
};
// Implements ProjectNode for qmake .pro files
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
class QMAKEPROJECTMANAGER_EXPORT QmakeProFile : public QmakePriFile
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
{
public:
ProjectExplorer: Move BuildSystem owership to BuildConfiguration ... or Target. This patch moves build system from conceptually "one per project" to "one per target (i.e. per project-and-kit)" or "per BuildConfigurations" for targets where the builds differ significantly. Building requires usually items from the kit (Qt version, compiler, ...) so a target-agnostic build is practically almost always wrong. Moving the build system to the target also has the potential to solve issues caused by switching targets while parsing, that used Project::activeTarget() regularly, with potentially different results before and after the switch. This patch might create performance/size regressions when several targets are set up per project as the build system implementation's internal data are duplicated in this case. The idea is to fix that by sharing per-project pieces again in the project implementation once these problems occur. Change-Id: I87f640ce418b93175b5029124eaa55f3b8721dca Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-25 09:55:32 +02:00
QmakeProFile(QmakeBuildSystem *buildSystem, const Utils::FilePath &filePath);
QMakeProjectManager: Move some parsing code out of the UI thread When parsing larger qmake project, the callbacks from the parser threads are currently overloading the UI thread, often rendering the application non-responsive until the project is completely loaded. This patch moves some expensive operations from the UI thread into the parser threads, at the cost of a somewhat ugly two-stage setup for some types of objects. On my Linux machine, I measured that the time spent in parser callback code went down by almost 50% when loading the Qt Creator super project. Task-number: QTCREATORBUG-18533 Change-Id: If9624da5b07e81a50c180693580b20a70e1aaea7 Reviewed-by: hjk <hjk@qt.io>
2020-01-31 15:52:20 +01:00
explicit QmakeProFile(const Utils::FilePath &filePath);
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
~QmakeProFile() override;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
bool isParent(QmakeProFile *node);
qmake: add displayname method to Qmake*File Change-Id: I90e6ef357f050953f51ae9cad4eb1c1d2daf4e5a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:24:32 +01:00
QString displayName() const final;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
qmake: Implement QmakeProFile::allProFiles Change-Id: I9074b398e8b90657125c697cfa366f304c6c9ab5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:40:09 +01:00
QList<QmakeProFile *> allProFiles();
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
QmakeProFile *findProFile(const Utils::FilePath &fileName);
const QmakeProFile *findProFile(const Utils::FilePath &fileName) const;
qmake: Implement QmakeProFile::allProFiles Change-Id: I9074b398e8b90657125c697cfa366f304c6c9ab5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:40:09 +01:00
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
ProjectType projectType() const;
QStringList variableValue(const Variable var) const;
QString singleVariableValue(const Variable var) const;
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
bool isSubProjectDeployable(const Utils::FilePath &filePath) const {
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
return !m_subProjectsNotToDeploy.contains(filePath);
}
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
Utils::FilePath sourceDir() const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
Utils: Rename FilePathList to simply FilePaths The exact storage type does not really matter here. Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-17 14:07:53 +01:00
Utils::FilePaths generatedFiles(const Utils::FilePath &buildDirectory,
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
const Utils::FilePath &sourceFile,
qmake: move over from QmakeProjectNodes to QmakeParserNodes Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 11:16:18 +01:00
const ProjectExplorer::FileType &sourceFileType) const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QList<ProjectExplorer::ExtraCompiler *> extraCompilers() const;
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
TargetInformation targetInformation() const;
InstallsList installsList() const;
QmakePM: Find prf files for CONFIG values ... in the pro file editor. When the user selects "Jump to file under cursor" (e.g. via F2), and the string under the cursor is not resolvable as a local file path, we assume it is a CONFIG value and try to locate a corresponding prf file. To this end, we expose the "feature roots" information of the qmake evaluator in the QmakeProFile class. Fixes: QTCREATORBUG-15753 Change-Id: Ibdc6e194a40f07030a5d21f2ddc7b92b63d1765b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-03-19 16:03:36 +01:00
const QStringList featureRoots() const { return m_featureRoots; }
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QByteArray cxxDefines() const;
enum AsyncUpdateDelay { ParseNow, ParseLater };
qmake: Rename QmakeParser*FileNode to Qmake*File Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 16:45:36 +01:00
using QmakePriFile::scheduleUpdate;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
void scheduleUpdate(AsyncUpdateDelay delay);
bool validParse() const;
bool parseInProgress() const;
void setParseInProgressRecursive(bool b);
void asyncUpdate();
ProjectExplorer: Add special handling for removing files ... from a project which are pulled in via wildcards. Such files cannot be removed from a project file, because they are not listed verbatim. This kind of failure should not be reported to the user if the file is also deleted, as the file list will have the correct state after the next reparse. Fixes: QTCREATORBUG-22586 Done-with: Christian Kandeler <christian.kandeler@qt.io> Change-Id: I3dc66fe9a6594be7d0b86f46d830cd099ee49fd7 Reviewed-by: hjk <hjk@qt.io>
2019-06-18 14:39:38 +03:00
bool isFileFromWildcard(const QString &filePath) const;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
private:
Refactor the lifetime of future watcher inside QmakeProFile Create future watcher only prior to starting an async task. After the task is done, clean the watcher in order to release the resources kept inside its QFuture's result. Make setupFutureWatcher() a private member. Provide a corresponding cleanupFutureWatcher(). Change-Id: I9d2b058250a3f749a2c9ad51323d2d38f66ee98d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-25 11:18:49 +02:00
void cleanupFutureWatcher();
void setupFutureWatcher();
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
void setParseInProgress(bool b);
void setValidParseRecursive(bool b);
void setupReader();
Internal::QmakeEvalInput evalInput() const;
QmakeProjectManager: Do not leak QmakeEvalResults Fixes: QTCREATORBUG-26326 Change-Id: I2a4abf86e9dd607bf7a0bf0843b0c9bff943d704 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-21 12:15:57 +02:00
static Internal::QmakeEvalResultPtr evaluate(const Internal::QmakeEvalInput &input);
void applyEvaluate(const Internal::QmakeEvalResultPtr &parseResult);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakeProjectManager: Do not leak QmakeEvalResults Fixes: QTCREATORBUG-26326 Change-Id: I2a4abf86e9dd607bf7a0bf0843b0c9bff943d704 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-21 12:15:57 +02:00
void asyncEvaluate(QFutureInterface<Internal::QmakeEvalResultPtr> &fi,
Internal::QmakeEvalInput input);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
void cleanupProFileReaders();
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
void updateGeneratedFiles(const Utils::FilePath &buildDir);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
static QString uiDirPath(QtSupport::ProFileReader *reader, const Utils::FilePath &buildDir);
static QString mocDirPath(QtSupport::ProFileReader *reader, const Utils::FilePath &buildDir);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
static QString sysrootify(const QString &path, const QString &sysroot, const QString &baseDir, const QString &outputDir);
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
static QStringList includePaths(QtSupport::ProFileReader *reader, const Utils::FilePath &sysroot, const Utils::FilePath &buildDir, const QString &projectDir);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
static QStringList libDirectories(QtSupport::ProFileReader *reader);
Utils: Rename FilePathList to simply FilePaths The exact storage type does not really matter here. Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-17 14:07:53 +01:00
static Utils::FilePaths subDirsPaths(QtSupport::ProFileReader *reader, const QString &projectDir, QStringList *subProjectsNotToDeploy, QStringList *errors);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
static TargetInformation targetInformation(QtSupport::ProFileReader *reader, QtSupport::ProFileReader *readerBuildPass, const Utils::FilePath &buildDir, const Utils::FilePath &projectFilePath);
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
static InstallsList installsList(const QtSupport::ProFileReader *reader, const QString &projectFilePath, const QString &projectDir, const QString &buildDir);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
void setupExtraCompiler(const Utils::FilePath &buildDir,
qmake: move over from QmakeProjectNodes to QmakeParserNodes Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 11:16:18 +01:00
const ProjectExplorer::FileType &fileType,
ProjectExplorer::ExtraCompilerFactory *factory);
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
bool m_validParse = false;
bool m_parseInProgress = false;
qmake: QmakePriFile is no longer a ProjectNode Change-Id: Ife3ca88e0d4e0a9de290b2b991ac8d10e3c55674 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 09:56:33 +01:00
QString m_displayName;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
ProjectType m_projectType = ProjectType::Invalid;
qmake: Add method to find QmakePriFiles and QmakeProFiles Change-Id: I04a75b94603b5483d5f9eaa827d08415c0a92985 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:24:57 +01:00
using VariablesHash = QHash<Variable, QStringList>;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
VariablesHash m_varValues;
qmake: Add method to find QmakePriFiles and QmakeProFiles Change-Id: I04a75b94603b5483d5f9eaa827d08415c0a92985 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 12:24:57 +01:00
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QList<ProjectExplorer::ExtraCompiler *> m_extraCompilers;
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
TargetInformation m_qmakeTargetInformation;
Utils: Rename FilePathList to simply FilePaths The exact storage type does not really matter here. Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-17 14:07:53 +01:00
Utils::FilePaths m_subProjectsNotToDeploy;
qmake: Unify TargetInformation and TargetParserInformation again Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 13:44:13 +01:00
InstallsList m_installsList;
QmakePM: Find prf files for CONFIG values ... in the pro file editor. When the user selects "Jump to file under cursor" (e.g. via F2), and the string under the cursor is not resolvable as a local file path, we assume it is a CONFIG value and try to locate a corresponding prf file. To this end, we expose the "feature roots" information of the qmake evaluator in the QmakeProFile class. Fixes: QTCREATORBUG-15753 Change-Id: Ibdc6e194a40f07030a5d21f2ddc7b92b63d1765b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-03-19 16:03:36 +01:00
QStringList m_featureRoots;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QmakeProjectManager: Watch wildcard directories for changes If e.g. DISTFILES contains wildcards, watch the directory for changes. Fixes: QTCREATORBUG-21603 Change-Id: Ia6e8c94ab7b74e0404776ba1d7d9b10eb3b643de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-30 10:31:56 +02:00
std::unique_ptr<Utils::FileSystemWatcher> m_wildcardWatcher;
QmakePM: Only schedule update when files are added/removed When a file is saved, the directory is also touched. If files are not added or removed, it is not necessary to reparse the project. Change-Id: I718db68362d41ba936629be880f739ad79b8cb6f Fixes: QTCREATORBUG-22361 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-25 11:06:58 +03:00
QMap<QString, QStringList> m_wildcardDirectoryContents;
QmakeProjectManager: Watch wildcard directories for changes If e.g. DISTFILES contains wildcards, watch the directory for changes. Fixes: QTCREATORBUG-21603 Change-Id: Ia6e8c94ab7b74e0404776ba1d7d9b10eb3b643de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-30 10:31:56 +02:00
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
// Async stuff
QmakeProjectManager: Do not leak QmakeEvalResults Fixes: QTCREATORBUG-26326 Change-Id: I2a4abf86e9dd607bf7a0bf0843b0c9bff943d704 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-10-21 12:15:57 +02:00
QFutureWatcher<Internal::QmakeEvalResultPtr> *m_parseFutureWatcher = nullptr;
qmake: Introduce QMakeParserNodes Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming things so that nothing conflicts and both sets of Nodes can be built at the same time. The goal of this patchset is to disentangle the project parsing from the project structure as shown in the project tree. Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:40:25 +01:00
QtSupport::ProFileReader *m_readerExact = nullptr;
QtSupport::ProFileReader *m_readerCumulative = nullptr;
};
} // namespace QmakeProjectManager
Copy Permalink