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
bae2cefc
Commit
bae2cefc
authored
Jan 18, 2011
by
Christian Kandeler
Browse files
Fix non-Linux compilation.
parent
cd3b6c7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/librarydetailscontroller.cpp
View file @
bae2cefc
...
...
@@ -53,7 +53,8 @@ LibraryDetailsController::LibraryDetailsController(
Qt4BuildConfiguration
*
qt4BuildConfiguration
=
qobject_cast
<
Qt4BuildConfiguration
*>
(
project
->
activeTarget
()
->
activeBuildConfiguration
());
// if its toolchain is maemo behave the same as we would be on linux
if
(
qt4BuildConfiguration
&&
qt4BuildConfiguration
->
toolChainType
()
==
ProjectExplorer
::
ToolChain_GCC_MAEMO
)
if
(
qt4BuildConfiguration
&&
(
qt4BuildConfiguration
->
toolChainType
()
==
ProjectExplorer
::
ToolChain_GCC_MAEMO5
||
qt4BuildConfiguration
->
toolChainType
()
==
ProjectExplorer
::
ToolChain_GCC_HARMATTAN
))
m_creatorPlatform
=
CreatorLinux
;
#endif
...
...
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
bae2cefc
...
...
@@ -148,8 +148,10 @@ QStringList QMakeStep::moreArguments()
QStringList
arguments
;
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
const
ProjectExplorer
::
ToolChainType
type
=
bc
->
toolChainType
();
if
(
type
==
ProjectExplorer
::
ToolChain_GCC_MAEMO
)
if
(
type
==
ProjectExplorer
::
ToolChain_GCC_MAEMO5
||
type
==
ProjectExplorer
::
ToolChain_GCC_HARMATTAN
)
{
arguments
<<
QLatin1String
(
"-unix"
);
}
#endif
if
(
!
bc
->
qtVersion
()
->
supportsShadowBuilds
())
{
// We have a target which does not allow shadow building.
...
...
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