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
99849441
Commit
99849441
authored
Nov 30, 2009
by
dt
Browse files
Fix compile
parent
d6d48fa2
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
99849441
...
...
@@ -137,7 +137,7 @@ bool QMakeStep::init()
if
(
QDir
(
workingDirectory
).
exists
(
QLatin1String
(
"Makefile"
)))
{
QString
qmakePath
=
QtVersionManager
::
findQMakeBinaryFromMakefile
(
workingDirectory
);
if
(
qtVersion
->
qmakeCommand
()
==
qmakePath
)
{
m_needToRunQMake
=
!
qt4bc
->
compare
BuildConfiguration
ToImportFrom
(
workingDirectory
);
m_needToRunQMake
=
!
qt4bc
->
compareToImportFrom
(
workingDirectory
);
}
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View file @
99849441
...
...
@@ -506,7 +506,7 @@ QString MaemoRunConfiguration::maddeRoot() const
const
QString
MaemoRunConfiguration
::
sysRoot
()
const
{
if
(
const
MaemoToolChain
*
tc
=
toolchain
())
return
t
oolchain
()
->
sysrootRoot
();
return
t
c
->
sysrootRoot
();
return
QString
();
}
...
...
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