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
8161acac
Commit
8161acac
authored
Jun 05, 2009
by
dt
Browse files
Fix crash introduced by actualy freeing memory.
Reviewed-By: con
parent
6c14c86f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
8161acac
...
...
@@ -385,8 +385,7 @@ QtVersion::QtVersion(const QString &name, const QString &path)
QtVersion
::~
QtVersion
()
{
delete
m_toolChain
;
m_toolChain
=
0
;
}
QString
QtVersion
::
name
()
const
...
...
@@ -853,7 +852,7 @@ void QtVersion::updateQMakeCXX() const
ProjectExplorer
::
ToolChain
*
QtVersion
::
toolChain
()
const
{
updateToolChain
();
return
m_toolChain
;
return
m_toolChain
.
data
()
;
}
void
QtVersion
::
updateToolChain
()
const
...
...
@@ -893,11 +892,10 @@ void QtVersion::updateToolChain() const
qDebug
()
<<
"Qt Creator doesn't know about the system includes, nor the systems defines."
;
}
if
(
ProjectExplorer
::
ToolChain
::
equals
(
m_test
,
m_toolChain
))
{
if
(
ProjectExplorer
::
ToolChain
::
equals
(
m_test
,
m_toolChain
.
data
()
))
{
delete
m_test
;
}
else
{
delete
m_toolChain
;
m_toolChain
=
m_test
;
m_toolChain
=
QSharedPointer
<
ProjectExplorer
::
ToolChain
>
(
m_test
);
}
m_toolChainUpToDate
=
true
;
...
...
src/plugins/qt4projectmanager/qtversionmanager.h
View file @
8161acac
...
...
@@ -33,6 +33,7 @@
#include
<projectexplorer/environment.h>
#include
<projectexplorer/toolchain.h>
#include
<QtCore/QSharedPointer>
#include
<QtCore/QHash>
namespace
Qt4ProjectManager
{
...
...
@@ -154,7 +155,7 @@ private:
mutable
QString
m_qmakeCXX
;
mutable
bool
m_toolChainUpToDate
;
mutable
ProjectExplorer
::
ToolChain
*
m_toolChain
;
mutable
QSharedPointer
<
ProjectExplorer
::
ToolChain
>
m_toolChain
;
};
class
QtVersionManager
:
public
QObject
...
...
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