diff options
| author | con <qtc-committer@nokia.com> | 2010-07-13 11:31:05 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-13 11:31:05 +0200 |
| commit | d24d01f49c92cc45f7473ded912a5fef2e068e99 (patch) | |
| tree | 4d88e73d69926dd9d3e87af038dc396b39170ed9 /src/plugins/projectexplorer/projectnodes.h | |
| parent | f823c4810e3f544df2440db0c0e1966b6f197f4b (diff) | |
| parent | 52b9fcca2ddd5d5e95c6e13cbded018699c7dd68 (diff) | |
| download | qt-creator-d24d01f49c92cc45f7473ded912a5fef2e068e99.tar.gz | |
Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)
Conflicts:
src/plugins/debugger/debuggeragents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
Diffstat (limited to 'src/plugins/projectexplorer/projectnodes.h')
| -rw-r--r-- | src/plugins/projectexplorer/projectnodes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 3a4511e8b5..6679b6184a 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -147,7 +147,7 @@ private: // managed by ProjectNode friend class ProjectNode; QString m_displayName; - QIcon m_icon; + mutable QIcon m_icon; }; class PROJECTEXPLORER_EXPORT ProjectNode : public FolderNode |