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
0dc21f42
Commit
0dc21f42
authored
Apr 08, 2009
by
dt
Browse files
Add ToolChain paths to the building of the debuggign helper
Ugly as hell, that code needs a refactoring once 1.1 is out.
parent
2e1ecb5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
0dc21f42
...
...
@@ -1375,6 +1375,12 @@ bool QtVersion::hasDebuggingHelper() const
return
m_hasDebuggingHelper
;
}
// TODO buildDebuggingHelperLibrary needs to be accessible outside of the
// qt4versionmanager
// That probably means moving qt4version management into either the projectexplorer
// (The Projectexplorer plugin probably needs some splitting up, most of the stuff
// could be in a plugin shared by qt4projectmanager, cmakemanager and debugger.)
QString
QtVersion
::
buildDebuggingHelperLibrary
()
{
// Locations to try:
...
...
@@ -1420,6 +1426,21 @@ QString QtVersion::buildDebuggingHelperLibrary()
ProjectExplorer
::
Environment
env
=
ProjectExplorer
::
Environment
::
systemEnvironment
();
addToEnvironment
(
env
);
// TODO this is a hack to get, to be removed and rewritten for 1.2
//
// For MSVC and MINGW, we need a toolchain to get the right environment
ProjectExplorer
::
ToolChain
*
toolChain
=
0
;
ProjectExplorer
::
ToolChain
::
ToolChainType
t
=
toolchainType
();
if
(
t
==
ProjectExplorer
::
ToolChain
::
MinGW
)
toolChain
=
ProjectExplorer
::
ToolChain
::
createMinGWToolChain
(
"g++"
,
mingwDirectory
());
else
if
(
t
==
ProjectExplorer
::
ToolChain
::
MSVC
)
toolChain
=
ProjectExplorer
::
ToolChain
::
createMSVCToolChain
(
msvcVersion
());
if
(
toolChain
)
{
toolChain
->
addToEnvironment
(
env
);
delete
toolChain
;
toolChain
=
0
;
}
qmake
.
setEnvironment
(
env
.
toStringList
());
qmake
.
setWorkingDirectory
(
directory
);
qmake
.
setProcessChannelMode
(
QProcess
::
MergedChannels
);
...
...
@@ -1437,7 +1458,6 @@ QString QtVersion::buildDebuggingHelperLibrary()
// and think about how to fix that later
QString
make
;
ProjectExplorer
::
ToolChain
::
ToolChainType
t
=
toolchainType
();
if
(
t
==
ProjectExplorer
::
ToolChain
::
MinGW
)
make
=
"mingw32-make.exe"
;
else
if
(
t
==
ProjectExplorer
::
ToolChain
::
MSVC
||
t
==
ProjectExplorer
::
ToolChain
::
WINCE
)
...
...
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