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
031c7c16
Commit
031c7c16
authored
Apr 15, 2009
by
Oswald Buddenhagen
Browse files
QT_NO_CAST_FROM_ASCII safety
parent
870a3b39
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/shared/proparser/profileevaluator.cpp
View file @
031c7c16
...
...
@@ -639,11 +639,11 @@ bool ProFileEvaluator::Private::visitBeginProFile(ProFile * pro)
evaluateFile
(
mkspecDirectory
+
QLatin1String
(
"/default/qmake.conf"
),
&
ok
);
evaluateFile
(
mkspecDirectory
+
QLatin1String
(
"/features/default_pre.prf"
),
&
ok
);
QStringList
tmp
=
m_valuemap
.
value
(
"CONFIG"
);
QStringList
tmp
=
m_valuemap
.
value
(
QLatin1String
(
"CONFIG"
)
)
;
tmp
.
append
(
m_addUserConfigCmdArgs
);
foreach
(
const
QString
&
remove
,
m_removeUserConfigCmdArgs
)
tmp
.
removeAll
(
remove
);
m_valuemap
.
insert
(
"CONFIG"
,
tmp
);
m_valuemap
.
insert
(
QLatin1String
(
"CONFIG"
)
,
tmp
);
m_cumulative
=
cumulative
;
}
...
...
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