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
704deac4
Commit
704deac4
authored
Jun 18, 2010
by
Oswald Buddenhagen
Browse files
micro-optimize: allocate ProFileEvaluator on the stack
parent
192759cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
704deac4
...
...
@@ -1332,19 +1332,19 @@ void QtVersion::updateToolChainAndMkspec() const
ProMessageHandler
msgHandler
(
true
);
ProFileCacheManager
::
instance
()
->
incRefCount
();
ProFileParser
parser
(
ProFileCacheManager
::
instance
()
->
cache
(),
&
msgHandler
);
ProFileEvaluator
*
reader
=
new
ProFileE
valuator
(
&
option
,
&
parser
,
&
msgHandler
);
ProFileEvaluator
e
valuator
(
&
option
,
&
parser
,
&
msgHandler
);
if
(
ProFile
*
pro
=
parser
.
parsedProFile
(
m_mkspecFullPath
+
"/qmake.conf"
))
{
reader
->
setCumulative
(
false
);
reader
->
setParsePreAndPostFiles
(
false
);
reader
->
accept
(
pro
);
evaluator
.
setCumulative
(
false
);
evaluator
.
setParsePreAndPostFiles
(
false
);
evaluator
.
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
(
" "
));
QString
ce_arch
=
reader
->
value
(
"CE_ARCH"
);
QString
qt_arch
=
reader
->
value
(
"QT_ARCH"
);
QString
qmakeCXX
=
evaluator
.
values
(
"QMAKE_CXX"
).
join
(
" "
);
QString
makefileGenerator
=
evaluator
.
value
(
"MAKEFILE_GENERATOR"
);
QString
ce_sdk
=
evaluator
.
values
(
"CE_SDK"
).
join
(
QLatin1String
(
" "
));
QString
ce_arch
=
evaluator
.
value
(
"CE_ARCH"
);
QString
qt_arch
=
evaluator
.
value
(
"QT_ARCH"
);
if
(
!
ce_sdk
.
isEmpty
()
&&
!
ce_arch
.
isEmpty
())
{
QString
wincePlatformName
=
ce_sdk
+
" ("
+
ce_arch
+
QLatin1Char
(
')'
);
m_toolChains
<<
ToolChainPtr
(
ProjectExplorer
::
ToolChain
::
createWinCEToolChain
(
msvcVersion
(),
wincePlatformName
));
...
...
@@ -1405,7 +1405,7 @@ void QtVersion::updateToolChainAndMkspec() const
qDebug
()
<<
"Qt Creator doesn't know about the system includes, nor the systems defines."
;
}
QStringList
configValues
=
reader
->
values
(
"CONFIG"
);
QStringList
configValues
=
evaluator
.
values
(
"CONFIG"
);
m_defaultConfigIsDebugAndRelease
=
false
;
foreach
(
const
QString
&
value
,
configValues
)
{
if
(
value
==
"debug"
)
...
...
@@ -1421,7 +1421,6 @@ void QtVersion::updateToolChainAndMkspec() const
m_targetIds
.
insert
(
QLatin1String
(
Constants
::
QT_SIMULATOR_TARGET_ID
));
}
delete
reader
;
ProFileCacheManager
::
instance
()
->
decRefCount
();
m_toolChainUpToDate
=
true
;
}
...
...
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