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
192759cb
Commit
192759cb
authored
Jun 18, 2010
by
Oswald Buddenhagen
Browse files
use a ProFileParser+ProFileEvaluator instead of a ProFileReader
the latter does too much
parent
2b68df12
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
192759cb
...
...
@@ -1329,11 +1329,17 @@ void QtVersion::updateToolChainAndMkspec() const
ProFileOption
option
;
option
.
properties
=
versionInfo
();
ProMessageHandler
msgHandler
(
true
);
ProFileCacheManager
::
instance
()
->
incRefCount
();
ProFileReader
*
reader
=
new
ProFileReader
(
&
option
);
reader
->
setCumulative
(
false
);
reader
->
setParsePreAndPostFiles
(
false
);
reader
->
readProFile
(
m_mkspecFullPath
+
"/qmake.conf"
);
ProFileParser
parser
(
ProFileCacheManager
::
instance
()
->
cache
(),
&
msgHandler
);
ProFileEvaluator
*
reader
=
new
ProFileEvaluator
(
&
option
,
&
parser
,
&
msgHandler
);
if
(
ProFile
*
pro
=
parser
.
parsedProFile
(
m_mkspecFullPath
+
"/qmake.conf"
))
{
reader
->
setCumulative
(
false
);
reader
->
setParsePreAndPostFiles
(
false
);
reader
->
accept
(
pro
);
pro
->
deref
();
}
QString
qmakeCXX
=
reader
->
values
(
"QMAKE_CXX"
).
join
(
" "
);
QString
makefileGenerator
=
reader
->
value
(
"MAKEFILE_GENERATOR"
);
QString
ce_sdk
=
reader
->
values
(
"CE_SDK"
).
join
(
QLatin1String
(
" "
));
...
...
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