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
4fc0839b
Commit
4fc0839b
authored
Feb 23, 2011
by
Robert Loehning
Browse files
Compile fixes
parent
9cae0553
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/librarydetailscontroller.cpp
View file @
4fc0839b
...
...
@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController(
// if its toolchain is maemo behave the same as we would be on linux
if
(
qt4BuildConfiguration
&&
qt4BuildConfiguration
->
toolChain
()
&&
(
qt4BuildConfiguration
->
toolChain
()
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
HarmattanLinuxFlavo
u
r
||
qt4BuildConfiguration
->
toolChain
()
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
MaemoLinuxFlavo
u
r
))
&&
(
qt4BuildConfiguration
->
toolChain
()
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
HarmattanLinuxFlavor
||
qt4BuildConfiguration
->
toolChain
()
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
MaemoLinuxFlavor
))
m_creatorPlatform
=
CreatorLinux
;
#endif
...
...
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
4fc0839b
...
...
@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments()
QStringList
arguments
;
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
ProjectExplorer
::
ToolChain
*
tc
=
bc
->
toolChain
();
if
(
tc
&&
(
tc
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
HarmattanLinuxFlavo
u
r
||
tc
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
MaemoLinuxFlavo
u
r
))
if
(
tc
&&
(
tc
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
HarmattanLinuxFlavor
||
tc
->
targetAbi
().
osFlavor
()
==
ProjectExplorer
::
Abi
::
MaemoLinuxFlavor
))
arguments
<<
QLatin1String
(
"-unix"
);
#endif
if
(
!
bc
->
qtVersion
()
->
supportsShadowBuilds
())
{
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
4fc0839b
...
...
@@ -1536,7 +1536,7 @@ void QtVersion::updateAbiAndMkspec() const
QList
<
ProjectExplorer
::
Abi
>
tmp
=
m_abis
;
m_abis
.
clear
();
foreach
(
const
ProjectExplorer
::
Abi
&
abi
,
tmp
)
m_abis
.
append
(
ProjectExplorer
::
Abi
(
abi
.
architecture
(),
abi
.
os
(),
ProjectExplorer
::
Abi
::
WindowsMSysFlavo
u
r
,
m_abis
.
append
(
ProjectExplorer
::
Abi
(
abi
.
architecture
(),
abi
.
os
(),
ProjectExplorer
::
Abi
::
WindowsMSysFlavor
,
abi
.
binaryFormat
(),
abi
.
wordWidth
()));
}
#endif
...
...
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