diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 10:01:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 10:01:04 +0200 |
| commit | a55d47544a104bbe8270bd6b5a72a1215018059c (patch) | |
| tree | a922470562cd187d1b986a8db0df776e37cdc248 /src/plugins/valgrind/xmlprotocol/stackmodel.cpp | |
| parent | 996122b7e9c05c5baca56809d8cd2cf1b58a9f39 (diff) | |
| parent | 471f44aae3ca09d445ae4f424b2242b371580a3e (diff) | |
| download | qt-creator-a55d47544a104bbe8270bd6b5a72a1215018059c.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.qbp
src/plugins/qtsupport/baseqtversion.cpp
src/tools/tools.pro
Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
Diffstat (limited to 'src/plugins/valgrind/xmlprotocol/stackmodel.cpp')
| -rw-r--r-- | src/plugins/valgrind/xmlprotocol/stackmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp index 408f99fcd9..63f8defa46 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp @@ -192,7 +192,7 @@ QModelIndex StackModel::parent(const QModelIndex &child) const { QTC_ASSERT(!child.isValid() || child.model() == this, return QModelIndex()); - if (child.internalId() == -1) + if (quintptr(child.internalId()) == quintptr(-1)) return QModelIndex(); return createIndex(child.internalId(), 0, -1); } |