Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
20e45a0d
Commit
20e45a0d
authored
Feb 09, 2011
by
Oswald Buddenhagen
Browse files
don't try to collect values from null files
it would collect global values instead.
parent
dc09a3f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4nodes.cpp
View file @
20e45a0d
...
...
@@ -540,23 +540,19 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
const
QString
&
projectDir
=
m_qt4ProFileNode
->
m_projectDir
;
QStringList
baseVPathsExact
=
baseVPaths
(
readerExact
,
projectDir
);
QStringList
baseVPathsCumulative
=
baseVPaths
(
readerCumulative
,
projectDir
);
const
QVector
<
Qt4NodeStaticData
::
FileTypeData
>
&
fileTypes
=
qt4NodeStaticData
()
->
fileTypeData
;
InternalNode
contents
;
// Figure out DEPLOYMENT and INSTALL folders
QStringList
folders
;
QStringList
dynamicVariables
=
dynamicVarNames
(
readerExact
,
readerCumulative
);
foreach
(
const
QString
&
dynamicVar
,
dynamicVariables
)
{
folders
+=
readerExact
->
values
(
dynamicVar
,
includeFileExact
);
// Ignore stuff from cumulative parse
// we are recursively enumerating all the files from those folders
// and add watchers for them, that's too dangerous if we get the foldrs
// wrong and enumerate the whole project tree multiple times
}
if
(
includeFileExact
)
foreach
(
const
QString
&
dynamicVar
,
dynamicVariables
)
{
folders
+=
readerExact
->
values
(
dynamicVar
,
includeFileExact
);
// Ignore stuff from cumulative parse
// we are recursively enumerating all the files from those folders
// and add watchers for them, that's too dangerous if we get the foldrs
// wrong and enumerate the whole project tree multiple times
}
for
(
int
i
=
0
;
i
<
folders
.
size
();
++
i
)
{
...
...
@@ -597,6 +593,15 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
QMap
<
FileType
,
QSet
<
QString
>
>
foundFiles
;
QStringList
baseVPathsExact
;
if
(
includeFileExact
)
baseVPathsExact
=
baseVPaths
(
readerExact
,
projectDir
);
QStringList
baseVPathsCumulative
;
if
(
includeFileCumlative
)
baseVPathsCumulative
=
baseVPaths
(
readerCumulative
,
projectDir
);
const
QVector
<
Qt4NodeStaticData
::
FileTypeData
>
&
fileTypes
=
qt4NodeStaticData
()
->
fileTypeData
;
// update files
for
(
int
i
=
0
;
i
<
fileTypes
.
size
();
++
i
)
{
FileType
type
=
fileTypes
.
at
(
i
).
type
;
...
...
@@ -604,12 +609,14 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
QSet
<
QString
>
newFilePaths
;
foreach
(
const
QString
&
qmakeVariable
,
qmakeVariables
)
{
QStringList
vPathsExact
=
fullVPaths
(
baseVPathsExact
,
readerExact
,
type
,
qmakeVariable
,
projectDir
);
QStringList
vPathsCumulative
=
fullVPaths
(
baseVPathsCumulative
,
readerCumulative
,
type
,
qmakeVariable
,
projectDir
);
newFilePaths
+=
readerExact
->
absoluteFileValues
(
qmakeVariable
,
projectDir
,
vPathsExact
,
includeFileExact
).
toSet
();
newFilePaths
+=
readerCumulative
->
absoluteFileValues
(
qmakeVariable
,
projectDir
,
vPathsCumulative
,
includeFileCumlative
).
toSet
();
if
(
includeFileExact
)
{
QStringList
vPathsExact
=
fullVPaths
(
baseVPathsExact
,
readerExact
,
type
,
qmakeVariable
,
projectDir
);
newFilePaths
+=
readerExact
->
absoluteFileValues
(
qmakeVariable
,
projectDir
,
vPathsExact
,
includeFileExact
).
toSet
();
}
if
(
includeFileCumlative
)
{
QStringList
vPathsCumulative
=
fullVPaths
(
baseVPathsCumulative
,
readerCumulative
,
type
,
qmakeVariable
,
projectDir
);
newFilePaths
+=
readerCumulative
->
absoluteFileValues
(
qmakeVariable
,
projectDir
,
vPathsCumulative
,
includeFileCumlative
).
toSet
();
}
}
foundFiles
[
type
]
=
newFilePaths
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment