diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-01 06:48:50 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-01 06:48:50 (GMT) |
| commit | 70ba57c4716749c99e302a4eda4695942d0b45fe (patch) | |
| tree | a59cd703b68ed7e484232410c157cc63a33f232e /tools | |
| parent | 15f331834833e34c1faf437b6fe3d3ef58691651 (diff) | |
| parent | 450508cf9a19473644de20e64bb1098050806182 (diff) | |
| download | Qt-70ba57c4716749c99e302a4eda4695942d0b45fe.zip Qt-70ba57c4716749c99e302a4eda4695942d0b45fe.tar.gz Qt-70ba57c4716749c99e302a4eda4695942d0b45fe.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/doc/images/assistant-assistant.png | bin | 105954 -> 205326 bytes | |||
| -rw-r--r-- | tools/porting/src/codemodel.h | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/doc/images/assistant-assistant.png b/tools/assistant/tools/assistant/doc/images/assistant-assistant.png Binary files differindex b825de0..1ff5cc9 100644 --- a/tools/assistant/tools/assistant/doc/images/assistant-assistant.png +++ b/tools/assistant/tools/assistant/doc/images/assistant-assistant.png diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h index cb3088f..04ad178 100644 --- a/tools/porting/src/codemodel.h +++ b/tools/porting/src/codemodel.h @@ -96,7 +96,7 @@ class Collection: public QMultiHash<QByteArray, CollectedType *> { public: void add(CollectedType *collectedItem) - { insert(collectedItem->name(), collectedItem); } + { this->insert(collectedItem->name(), collectedItem); } }; typedef Collection<Scope> ScopeCollection; |
