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
a03f8643
Commit
a03f8643
authored
May 20, 2009
by
Oswald Buddenhagen
Browse files
make message() & co. handling more qmake-like
which basically means cutting features. heh
parent
88de3e6a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/shared/proparser/profileevaluator.cpp
View file @
a03f8643
...
...
@@ -2207,20 +2207,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
return
ProItem
::
ReturnFalse
;
}
QString
msg
=
fixEnvVariables
(
args
.
first
());
if
(
function
==
QLatin1String
(
"error"
))
{
QStringList
parents
;
foreach
(
ProFile
*
proFile
,
m_profileStack
)
parents
.
append
(
proFile
->
fileName
());
if
(
!
parents
.
isEmpty
())
parents
.
takeLast
();
if
(
parents
.
isEmpty
())
q
->
fileMessage
(
format
(
"Project ERROR: %1"
).
arg
(
msg
));
else
q
->
fileMessage
(
format
(
"Project ERROR: %1. File was included from: '%2'"
)
.
arg
(
msg
).
arg
(
parents
.
join
(
QLatin1String
(
"', '"
))));
}
else
{
q
->
fileMessage
(
format
(
"Project MESSAGE: %1"
).
arg
(
msg
));
}
q
->
fileMessage
(
QString
::
fromLatin1
(
"Project %1: %2"
).
arg
(
function
.
toUpper
(),
msg
));
return
ProItem
::
ReturnFalse
;
}
#if 0 // Way too dangerous to enable.
...
...
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