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

remove pretenses of support for DEPLOYMENT with .sources

Browse Source 
since fa6d0f1231, DEPLOYMENT is aliased to INSTALLS, so we would have to
actually look for .sources in entries listed in that variable, which we
didn't. apparently, nobody noticed, among other things possibly because
the qt4 variant already supports .files in later versions.
also, our actual deployment code doesn't use .sources, either.

Change-Id: I990240716817118047fc9aa97eff55305fcf7eca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Oswald Buddenhagen
2016-10-21 18:59:36 +02:00
parent 2d6f33a92b
commit 3c43c35167
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -199,7 +199,6 @@ public:
QtSupport::ProFileReader *readerCumulative; QtSupport::ProFileReader *readerCumulative;
ProFileGlobals *qmakeGlobals; ProFileGlobals *qmakeGlobals;
QMakeVfs *qmakeVfs; QMakeVfs *qmakeVfs;
bool isQt5;
}; };
class PriFileEvalResult class PriFileEvalResult
@@ -639,7 +638,7 @@ PriFileEvalResult QmakePriFileNode::extractValues(const EvalInput &input,
// all the files from those folders and add watchers for them. That's too // all the files from those folders and add watchers for them. That's too
// dangerous if we get the folders wrong and enumerate the whole project // dangerous if we get the folders wrong and enumerate the whole project
// tree multiple times. // tree multiple times.
QStringList dynamicVariables = dynamicVarNames(input.readerExact, input.isQt5); QStringList dynamicVariables = dynamicVarNames(input.readerExact);
foreach (ProFile *includeFileExact, includeFilesExact) foreach (ProFile *includeFileExact, includeFilesExact)
foreach (const QString &dynamicVar, dynamicVariables) foreach (const QString &dynamicVar, dynamicVariables)
result.folders += input.readerExact->values(dynamicVar, includeFileExact); result.folders += input.readerExact->values(dynamicVar, includeFileExact);
@@ -1461,25 +1460,15 @@ QStringList QmakePriFileNode::varNamesForRemoving()
return vars; return vars;
} }
QStringList QmakePriFileNode::dynamicVarNames(QtSupport::ProFileReader *readerExact, QStringList QmakePriFileNode::dynamicVarNames(QtSupport::ProFileReader *reader)
bool isQt5)
{ {
QStringList result; QStringList result;
// Figure out DEPLOYMENT and INSTALLS // Figure out INSTALLS (and DEPLOYMENT, as it's aliased)
const QString deployment = QLatin1String("DEPLOYMENT");
const QString sources = QLatin1String(isQt5 ? ".files" : ".sources");
QStringList listOfVars = readerExact->values(deployment);
foreach (const QString &var, listOfVars) {
result << (var + sources);
}
const QString installs = QLatin1String("INSTALLS"); const QString installs = QLatin1String("INSTALLS");
const QString files = QLatin1String(".files"); const QString files = QLatin1String(".files");
listOfVars = readerExact->values(installs); foreach (const QString &var, reader->values(installs))
foreach (const QString &var, listOfVars) {
result << (var + files); result << (var + files);
}
result.removeDuplicates(); result.removeDuplicates();
return result; return result;
} }
@@ -1792,10 +1781,6 @@ EvalInput QmakeProFileNode::evalInput() const
input.buildDirectory = buildDir(); input.buildDirectory = buildDir();
input.readerExact = m_readerExact; input.readerExact = m_readerExact;
input.readerCumulative = m_readerCumulative; input.readerCumulative = m_readerCumulative;
Target *t = m_project->activeTarget();
Kit *k = t ? t->kit() : KitManager::defaultKit();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
input.isQt5 = !qtVersion || qtVersion->qtVersion() >= QtSupport::QtVersionNumber(5,0,0);
input.qmakeGlobals = m_project->qmakeGlobals(); input.qmakeGlobals = m_project->qmakeGlobals();
input.qmakeVfs = m_project->qmakeVfs(); input.qmakeVfs = m_project->qmakeVfs();
return input; return input;

2
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -180,7 +180,7 @@ protected:
static QStringList varNames(ProjectExplorer::FileType type, QtSupport::ProFileReader *readerExact); static QStringList varNames(ProjectExplorer::FileType type, QtSupport::ProFileReader *readerExact);
static QStringList varNamesForRemoving(); static QStringList varNamesForRemoving();
static QString varNameForAdding(const QString &mimeType); static QString varNameForAdding(const QString &mimeType);
static QStringList dynamicVarNames(QtSupport::ProFileReader *readerExact, bool isQt5); static QStringList dynamicVarNames(QtSupport::ProFileReader *readerExact);
static QSet<Utils::FileName> filterFilesProVariables(ProjectExplorer::FileType fileType, const QSet<Utils::FileName> &files); static QSet<Utils::FileName> filterFilesProVariables(ProjectExplorer::FileType fileType, const QSet<Utils::FileName> &files);
static QSet<Utils::FileName> filterFilesRecursiveEnumerata(ProjectExplorer::FileType fileType, const QSet<Utils::FileName> &files); static QSet<Utils::FileName> filterFilesRecursiveEnumerata(ProjectExplorer::FileType fileType, const QSet<Utils::FileName> &files);