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
Tobias Hunger
qt-creator
Commits
fc421df1
Commit
fc421df1
authored
Jun 08, 2010
by
Oswald Buddenhagen
Browse files
micro-optimizations
parent
be1e0d2d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4nodes.cpp
View file @
fc421df1
...
...
@@ -522,9 +522,9 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
newFilePaths
+=
readerCumulative
->
absoluteFileValues
(
qmakeVariable
,
projectDir
,
vPathsCumulative
,
includeFileCumlative
);
}
newFilePaths
.
removeDuplicates
();
if
(
!
newFilePaths
.
isEmpty
())
{
newFilePaths
.
removeDuplicates
();
InternalNode
*
subfolder
=
new
InternalNode
;
subfolder
->
type
=
type
;
subfolder
->
icon
=
fileTypes
.
at
(
i
).
icon
;
...
...
@@ -1444,14 +1444,14 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
}
if
(
QFile
::
exists
(
realFile
))
{
if
(
!
subProjectPaths
.
contains
(
realFile
))
subProjectPaths
<<
realFile
;
subProjectPaths
<<
realFile
;
}
else
{
m_project
->
proFileParseError
(
tr
(
"Could not find .pro file for sub dir '%1' in '%2'"
)
.
arg
(
subDirVar
).
arg
(
realDir
));
}
}
subProjectPaths
.
removeDuplicates
();
return
subProjectPaths
;
}
...
...
src/shared/proparser/profileevaluator.cpp
View file @
fc421df1
...
...
@@ -2468,7 +2468,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
#endif
case
T_EVAL
:
{
ProBlock
*
pro
=
new
ProBlock
();
QString
buf
=
args
.
join
(
QL
ati
n1String
(
" "
)
);
QString
buf
=
args
.
join
(
st
ati
cs
.
field_sep
);
if
(
!
readInternal
(
pro
,
buf
,
(
ushort
*
)
buf
.
data
()))
{
delete
pro
;
return
ProItem
::
ReturnFalse
;
...
...
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