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
73ff2581
Commit
73ff2581
authored
Feb 12, 2009
by
dt
Browse files
Fixes: Add Linux icc to the supported toolchains.
Details: Treat it the same as g++.
parent
113723bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/toolchain.h
View file @
73ff2581
...
...
@@ -40,6 +40,7 @@ public:
enum
ToolChainType
{
GCC
,
LinuxICC
,
MinGW
,
MSVC
,
WINCE
,
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
73ff2581
...
...
@@ -419,7 +419,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
m_test
=
ToolChain
::
createMSVCToolChain
(
version
->
msvcVersion
());
}
else
if
(
t
==
ToolChain
::
WINCE
)
{
m_test
=
ToolChain
::
createWinCEToolChain
(
version
->
msvcVersion
(),
version
->
wincePlatform
());
}
else
if
(
t
==
ToolChain
::
GCC
)
{
}
else
if
(
t
==
ToolChain
::
GCC
||
t
==
ToolChain
::
LinuxICC
)
{
QStringList
list
=
rootProjectNode
()
->
variableValue
(
Internal
::
CxxCompilerVar
);
QString
qmake_cxx
=
list
.
isEmpty
()
?
QString
::
null
:
list
.
first
();
Environment
env
=
Environment
::
systemEnvironment
();
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
73ff2581
...
...
@@ -1191,6 +1191,8 @@ ProjectExplorer::ToolChain::ToolChainType QtVersion::toolchainType() const
return
ProjectExplorer
::
ToolChain
::
INVALID
;
else
if
(
spec
.
startsWith
(
"wince"
))
return
ProjectExplorer
::
ToolChain
::
WINCE
;
else
if
(
spec
.
startsWith
(
"linux-icc"
))
return
ProjectExplorer
::
ToolChain
::
LinuxICC
;
else
return
ProjectExplorer
::
ToolChain
::
GCC
;
}
...
...
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