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
fed63463
Commit
fed63463
authored
Nov 30, 2009
by
kh1
Browse files
No need to cache the Qt version for this simple task.
Might fix some sporadic crashes that can be seen on first creator run.
parent
615105cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
View file @
fed63463
...
...
@@ -51,10 +51,10 @@ MaemoToolChain::MaemoToolChain(const Qt4ProjectManager::QtVersion *version)
,
m_maddeInitialized
(
false
)
,
m_sysrootInitialized
(
false
)
,
m_simulatorInitialized
(
false
)
,
m_targetInitialized
(
false
)
,
m_toolchainInitialized
(
false
)
,
m_version
(
version
)
{
QString
qmake
=
QDir
::
cleanPath
(
version
->
qmakeCommand
());
m_targetRoot
=
qmake
.
remove
(
QLatin1String
(
"/bin/qmake"
EXEC_SUFFIX
));
}
MaemoToolChain
::~
MaemoToolChain
()
...
...
@@ -79,18 +79,16 @@ QList<HeaderPath> MaemoToolChain::systemHeaderPaths()
void
MaemoToolChain
::
addToEnvironment
(
ProjectExplorer
::
Environment
&
env
)
{
if
(
m_version
)
{
env
.
prependOrSetPath
(
QDir
::
toNativeSeparators
(
QString
(
"%1/bin"
)
.
arg
(
maddeRoot
())));
env
.
prependOrSetPath
(
QDir
::
toNativeSeparators
(
QString
(
"%1/bin"
)
.
arg
(
targetRoot
())));
env
.
prependOrSetPath
(
QDir
::
toNativeSeparators
(
QString
(
"%1/bin"
)
.
arg
(
toolchainRoot
())));
env
.
prependOrSetPath
(
QDir
::
toNativeSeparators
(
QString
(
"%1/bin"
)
.
arg
(
maddeRoot
())));
env
.
prependOrSetPath
(
QDir
::
toNativeSeparators
(
QString
(
"%1/bin"
)
.
arg
(
targetRoot
())));
env
.
prependOrSetPath
(
QDir
::
toNativeSeparators
(
QString
(
"%1/bin"
)
.
arg
(
toolchainRoot
())));
#ifdef Q_OS_WIN
env
.
set
(
"HOME"
,
QDir
::
toNativeSeparators
(
maddeRoot
()
+
QLatin1String
(
"/home/"
)
+
QDir
::
home
().
dirName
()));
env
.
set
(
"HOME"
,
QDir
::
toNativeSeparators
(
maddeRoot
()
+
QLatin1String
(
"/home/"
)
+
QDir
::
home
().
dirName
()));
#endif
}
}
QString
MaemoToolChain
::
makeCommand
()
const
...
...
@@ -117,8 +115,6 @@ QString MaemoToolChain::maddeRoot() const
QString
MaemoToolChain
::
targetRoot
()
const
{
if
(
!
m_targetInitialized
)
(
const_cast
<
MaemoToolChain
*>
(
this
))
->
setTargetRoot
();
return
m_targetRoot
;
}
...
...
@@ -143,13 +139,6 @@ QString MaemoToolChain::toolchainRoot() const
return
m_toolchainRoot
;
}
void
MaemoToolChain
::
setTargetRoot
()
{
m_targetInitialized
=
true
;
QString
qmake
=
QDir
::
cleanPath
(
m_version
->
qmakeCommand
());
m_targetRoot
=
qmake
.
remove
(
QLatin1String
(
"/bin/qmake"
EXEC_SUFFIX
));
}
void
MaemoToolChain
::
setMaddeRoot
()
{
QDir
dir
(
targetRoot
());
...
...
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
View file @
fed63463
...
...
@@ -58,7 +58,6 @@ protected:
private:
void
setMaddeRoot
();
void
setTargetRoot
();
void
setSimulatorRoot
();
void
setSysrootAndToolchain
();
...
...
@@ -73,12 +72,9 @@ private:
bool
m_simulatorInitialized
;
QString
m_targetRoot
;
bool
m_targetInitialized
;
QString
m_toolchainRoot
;
bool
m_toolchainInitialized
;
const
Qt4ProjectManager
::
QtVersion
*
m_version
;
};
}
// namespace Internal
...
...
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