Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
Roberto Raggi
2009-06-04 16:18:49 +02:00
37 changed files with 425 additions and 184 deletions

View File

@@ -79,7 +79,7 @@ public:
virtual bool duplicateSupported() const;
virtual Core::IEditor *duplicate(QWidget *parent);
virtual bool temporaryEditor() const { return false; }
virtual bool isTemporary() const { return false; }
private:
QList<int> m_context;