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
5d0f65fc
Commit
5d0f65fc
authored
Feb 10, 2010
by
Oswald Buddenhagen
Browse files
don't assert on $$files(/foo)
parent
220f6b43
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/shared/proparser/profileevaluator.cpp
View file @
5d0f65fc
...
...
@@ -2220,7 +2220,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
}
int
slash
=
r
.
lastIndexOf
(
QDir
::
separator
());
if
(
slash
!=
-
1
)
{
dirs
.
append
(
r
.
left
(
slash
));
dirs
.
append
(
r
.
left
(
slash
+
1
));
r
=
r
.
mid
(
slash
+
1
);
}
else
{
dirs
.
append
(
QString
());
...
...
@@ -2230,15 +2230,13 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
for
(
int
d
=
0
;
d
<
dirs
.
count
();
d
++
)
{
QString
dir
=
dirs
[
d
];
QDir
qdir
(
pfx
+
dir
);
if
(
!
dir
.
isEmpty
()
&&
!
dir
.
endsWith
(
QDir
::
separator
()))
dir
+=
QDir
::
separator
();
for
(
int
i
=
0
;
i
<
(
int
)
qdir
.
count
();
++
i
)
{
if
(
qdir
[
i
]
==
statics
.
strDot
||
qdir
[
i
]
==
statics
.
strDotDot
)
continue
;
QString
fname
=
dir
+
qdir
[
i
];
if
(
IoUtils
::
fileType
(
pfx
+
fname
)
==
IoUtils
::
FileIsDir
)
{
if
(
recursive
)
dirs
.
append
(
fname
);
dirs
.
append
(
fname
+
QDir
::
separator
()
);
}
if
(
regex
.
exactMatch
(
qdir
[
i
]))
ret
+=
fname
;
...
...
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