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
d1edc2a2
Commit
d1edc2a2
authored
Feb 19, 2009
by
con
Browse files
Fixes: - Console application doesn't start on Mac
Task: - 244263 RevBy: - dt
parent
e863c9bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/shared/proparser/profileevaluator.cpp
View file @
d1edc2a2
...
...
@@ -768,11 +768,15 @@ bool ProFileEvaluator::Private::visitProValue(ProValue *value)
case
ProVariable
::
RemoveOperator
:
// -=
if
(
!
m_cumulative
)
{
if
(
!
m_skipLevel
)
{
removeEach
(
&
m_valuemap
,
varName
,
v
);
removeEach
(
&
m_filevaluemap
[
currentProFile
()],
varName
,
v
);
// the insertUnique is a hack for the moment to fix the
// CONFIG -= app_bundle problem on Mac (add it to a variable -CONFIG as was done before)
if
(
removeEach
(
&
m_valuemap
,
varName
,
v
)
==
0
)
insertUnique
(
&
m_valuemap
,
QString
(
"-%1"
).
arg
(
varName
),
v
);
if
(
removeEach
(
&
m_filevaluemap
[
currentProFile
()],
varName
,
v
)
==
0
)
insertUnique
(
&
m_filevaluemap
[
currentProFile
()],
QString
(
"-%1"
).
arg
(
varName
),
v
);
}
}
else
if
(
!
m_skipLevel
)
{
// th
is
is a hack for the moment to fix the
// th
e insertUnique
is a hack for the moment to fix the
// CONFIG -= app_bundle problem on Mac (add it to a variable -CONFIG as was done before)
insertUnique
(
&
m_valuemap
,
QString
(
"-%1"
).
arg
(
varName
),
v
);
insertUnique
(
&
m_filevaluemap
[
currentProFile
()],
QString
(
"-%1"
).
arg
(
varName
),
v
);
...
...
src/shared/proparser/proparserutils.h
View file @
d1edc2a2
...
...
@@ -140,12 +140,14 @@ static void insertUnique(QHash<QString, QStringList> *map,
sl
.
append
(
str
);
}
static
void
removeEach
(
QHash
<
QString
,
QStringList
>
*
map
,
static
int
removeEach
(
QHash
<
QString
,
QStringList
>
*
map
,
const
QString
&
key
,
const
QStringList
&
value
)
{
int
count
=
0
;
QStringList
&
sl
=
(
*
map
)[
key
];
foreach
(
const
QString
&
str
,
value
)
sl
.
removeAll
(
str
);
count
+=
sl
.
removeAll
(
str
);
return
count
;
}
/*
...
...
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