diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index e7f420e76770f735dcd93637d13d9d89fa2b5fa9..26c43e7c92af9704d476bfff9d5124534268b4c1 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5,7 +5,7 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 1.0.0
+    \section1 Version 1.0.80
 
     The goal of Qt Creator is to provide a cross-platform, complete Integrated
     Development Environment (IDE) to develop Qt projects. It is available for
@@ -60,7 +60,7 @@
        \o   \l{Keyboard Shortcuts}
        \o   \l{Glossary}
        \o   \l{Supported Platforms}
-       \o   \l{Known Issues of Version 1.0.0}
+       \o   \l{Known Issues of Version 1.0.80}
        \o   \l{Acknowledgements}
     \endlist
 
@@ -1449,9 +1449,9 @@
     \page creator-known-issues.html
     \nextpage creator-acknowledgements.html
 
-    \title Known Issues of Version 1.0.0
+    \title Known Issues of Version 1.0.80
 
-    There are some known issues with Qt Creator 1.0.0 .
+    There are some known issues with Qt Creator 1.0.80.
     The development team is aware of those, there is no need to report them as bug.
 
     \list
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index c704ecd4941b51e47be0d2bcb8b7c72be0864eb4..8baed7725cfaa5b6d14a1049d6fd14c940b1dcd0 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -17,15 +17,15 @@ sources.fileextensions  = "qtcreator.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.100
+qhp.QtCreator.namespace        = com.nokia.qtcreator.1080
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = classic.css \
                           images/qt-logo.png
-qhp.QtCreator.filterAttributes = qtcreator 1.0.0
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.0
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.0
+qhp.QtCreator.filterAttributes = qtcreator 1.0.80
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.0.80
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.0.80
 
 # macros.qdocconf
 
@@ -198,8 +198,8 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
                           "<td align=\"right\" valign=\"top\" width=\"230\"></td></tr></table><br>"
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
-                          "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
+                                  "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
                           "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia</td>\n" \
                           "<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
-                          "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.0</div></td>\n" \
+                          "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.0.80</div></td>\n" \
                           "</tr></table></div></address>"
diff --git a/share/qtcreator/Info.plist b/share/qtcreator/Info.plist
index b09768299823031b293fd8c80f176ed300296def..ee708daece93146c7db93edd1e73e71c4cac4cad 100644
--- a/share/qtcreator/Info.plist
+++ b/share/qtcreator/Info.plist
@@ -182,8 +182,8 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.nokia.qtcreator</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>1.0.80</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.80</string>
 </dict>
 </plist>
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 5be2a0b198e6498026f147aa85b15ecd4f9c3890..012c243de1c05fd5d0b9020fe4246feac3b671f5 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -28,6 +28,7 @@
 **************************************************************************/
 
 #include "CppDocument.h"
+#include "pp.h"
 
 #include <Control.h>
 #include <TranslationUnit.h>
@@ -145,9 +146,18 @@ void Document::appendMacro(const Macro &macro)
     _definedMacros.append(macro);
 }
 
-void Document::addMacroUse(const Macro &macro, unsigned offset, unsigned length)
+void Document::addMacroUse(const Macro &macro, unsigned offset, unsigned length,
+                           const QVector<MacroArgumentReference> &actuals)
 {
-    _macroUses.append(MacroUse(macro, offset, offset + length));
+    MacroUse use(macro, offset, offset + length);
+
+    foreach (const MacroArgumentReference &actual, actuals) {
+        const Block arg(actual.position(), actual.position() + actual.length());
+
+        use.addArgument(arg);
+    }
+
+    _macroUses.append(use);
 }
 
 TranslationUnit *Document::translationUnit() const
@@ -316,3 +326,18 @@ void Document::releaseTranslationUnit()
 {
     _translationUnit->release();
 }
+
+Snapshot::Snapshot()
+{
+}
+
+Snapshot::~Snapshot()
+{
+}
+
+void Snapshot::insert(Document::Ptr doc)
+{
+    if (doc)
+        insert(doc->fileName(), doc);
+}
+
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 26a8b0f9b474a14fbe92510c5cf222c6602d83ca..556e1293335adaca284918754096f456da252090 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -43,6 +43,7 @@
 namespace CPlusPlus {
 
 class Macro;
+class MacroArgumentReference;
 
 class CPLUSPLUS_EXPORT Document
 {
@@ -63,7 +64,8 @@ public:
     void addIncludeFile(const QString &fileName, unsigned line);
 
     void appendMacro(const Macro &macro);
-    void addMacroUse(const Macro &macro, unsigned offset, unsigned length);
+    void addMacroUse(const Macro &macro, unsigned offset, unsigned length,
+                     const QVector<MacroArgumentReference> &range);
 
     Control *control() const;
     TranslationUnit *translationUnit() const;
@@ -201,6 +203,7 @@ public:
 
     class MacroUse: public Block {
         Macro _macro;
+        QVector<Block> _arguments;
 
     public:
         inline MacroUse(const Macro &macro,
@@ -212,6 +215,18 @@ public:
 
         const Macro &macro() const
         { return _macro; }
+
+        bool isFunctionLike() const
+        { return _macro.isFunctionLike(); }
+
+        QVector<Block> arguments() const
+        { return _arguments; }
+
+        void setArguments(const QVector<Block> &arguments)
+        { _arguments = arguments; }
+
+        void addArgument(const Block &block)
+        { _arguments.append(block); }
     };
 
     QList<Include> includes() const
@@ -241,12 +256,15 @@ private:
 
 class CPLUSPLUS_EXPORT Snapshot: public QMap<QString, Document::Ptr>
 {
+    typedef QMap<QString, Document::Ptr> _Base;
+
 public:
-    Snapshot()
-    { }
+    Snapshot();
+    ~Snapshot();
+
+    void insert(Document::Ptr doc);
 
-    ~Snapshot()
-    { }
+    using _Base::insert;
 };
 
 } // end of namespace CPlusPlus
diff --git a/src/libs/cplusplus/PreprocessorClient.h b/src/libs/cplusplus/PreprocessorClient.h
index 8a0fdcf9305f2f966b5bcc508217ba3446dd82e9..632cb3b9d5ec9a89baad943b4b2075b3c44fed0d 100644
--- a/src/libs/cplusplus/PreprocessorClient.h
+++ b/src/libs/cplusplus/PreprocessorClient.h
@@ -31,7 +31,7 @@
 #define CPLUSPLUS_PP_CLIENT_H
 
 #include <CPlusPlusForwardDeclarations.h>
-#include <QtGlobal>
+#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
@@ -42,6 +42,23 @@ namespace CPlusPlus {
 
 class Macro;
 
+class CPLUSPLUS_EXPORT MacroArgumentReference
+{
+  unsigned _position;
+  unsigned _length;
+
+public:
+  MacroArgumentReference(unsigned position = 0, unsigned length = 0)
+    : _position(position), _length(length)
+  { }
+
+  unsigned position() const
+  { return _position; }
+
+  unsigned length() const
+  { return _length; }
+};
+
 class CPLUSPLUS_EXPORT Client
 {
   Client(const Client &other);
@@ -63,7 +80,9 @@ public:
 
   virtual void startExpandingMacro(unsigned offset,
                                    const Macro &macro,
-                                   const QByteArray &originalTextt) = 0;
+                                   const QByteArray &originalText,
+                                   const QVector<MacroArgumentReference> &actuals
+                                            = QVector<MacroArgumentReference>()) = 0;
 
   virtual void stopExpandingMacro(unsigned offset,
                                   const Macro &macro) = 0;
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 5b6320d2f237e38055d923a10aab0049329b11f8..d3ffabe34161d9f3bec9af41b10d82bf87666f22 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -741,10 +741,11 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
 
                         // `m' is function-like macro.
                         if (_dot->is(T_LPAREN)) {
-                            skipActualArguments();
+                            QVector<MacroArgumentReference> actuals;
+                            collectActualArguments(&actuals);
 
                             if (_dot->is(T_RPAREN)) {
-                                expandFunctionLikeMacro(identifierToken, m);
+                                expandFunctionLikeMacro(identifierToken, m, actuals);
                                 continue;
                             }
                         }
@@ -764,23 +765,58 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour
     _result = previousResult;
 }
 
-void Preprocessor::skipActualArguments()
+void Preprocessor::collectActualArguments(QVector<MacroArgumentReference> *actuals)
 {
-    int count = 0;
+    if (_dot->isNot(T_LPAREN))
+        return;
 
-    while (_dot->isNot(T_EOF_SYMBOL)) {
-        if (_dot->is(T_LPAREN))
-            ++count;
+    ++_dot;
 
-        else if (_dot->is(T_RPAREN)) {
-            if (! --count)
-                break;
-        }
+    if (_dot->is(T_RPAREN))
+        return;
+
+    actuals->append(collectOneActualArgument());
 
+    while (_dot->is(T_COMMA)) {
         ++_dot;
+
+        actuals->append(collectOneActualArgument());
     }
 }
 
+MacroArgumentReference Preprocessor::collectOneActualArgument()
+{
+    const unsigned position = _dot->begin();
+
+    while (_dot->isNot(T_EOF_SYMBOL)) {
+        if (_dot->is(T_COMMA) || _dot->is(T_RPAREN))
+            break;
+
+        if (_dot->isNot(T_LPAREN))
+            ++_dot;
+
+        else {
+            int count = 0;
+
+            for (; _dot->isNot(T_EOF_SYMBOL); ++_dot) {
+                if (_dot->is(T_LPAREN))
+                    ++count;
+
+                else if (_dot->is(T_RPAREN)) {
+                    if (! --count) {
+                        ++_dot;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    const unsigned end = _dot->begin();
+
+    return MacroArgumentReference(position, end - position);
+}
+
 Macro *Preprocessor::processObjectLikeMacro(TokenIterator identifierToken,
                                             const QByteArray &spell,
                                             Macro *m)
@@ -846,7 +882,9 @@ void Preprocessor::expandObjectLikeMacro(TokenIterator identifierToken,
         client->stopExpandingMacro(_dot->offset, *m);
 }
 
-void Preprocessor::expandFunctionLikeMacro(TokenIterator identifierToken, Macro *m)
+void Preprocessor::expandFunctionLikeMacro(TokenIterator identifierToken,
+                                           Macro *m,
+                                           const QVector<MacroArgumentReference> &actuals)
 {
     const char *beginOfText = startOfToken(*identifierToken);
     const char *endOfText = endOfToken(*_dot);
@@ -858,7 +896,7 @@ void Preprocessor::expandFunctionLikeMacro(TokenIterator identifierToken, Macro
                                         endOfText - beginOfText);
 
         client->startExpandingMacro(identifierToken->offset,
-                                    *m, text);
+                                    *m, text, actuals);
     }
 
     expand(beginOfText, endOfText, _result);
diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index b2987413eb9006c89d5e4fb8059716ba81f72f1c..eb0ddea66d6e92164a7270502ec83230d1c5eb02 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -109,7 +109,8 @@ private:
     void expandObjectLikeMacro(TokenIterator identifierToken,
                                const QByteArray &spell,
                                Macro *m, QByteArray *result);
-    void expandFunctionLikeMacro(TokenIterator identifierToken, Macro *m);
+    void expandFunctionLikeMacro(TokenIterator identifierToken, Macro *m,
+                                 const QVector<MacroArgumentReference> &actuals);
 
     void resetIfLevel();
     bool testIfLevel();
@@ -129,7 +130,8 @@ private:
     QByteArray tokenSpell(const CPlusPlus::Token &token) const;
     QByteArray tokenText(const CPlusPlus::Token &token) const; // does a deep copy
 
-    void skipActualArguments();
+    void collectActualArguments(QVector<MacroArgumentReference> *actuals);
+    MacroArgumentReference collectOneActualArgument();
 
     void processNewline();
 
diff --git a/src/plugins/bineditor/BinEditor.pluginspec b/src/plugins/bineditor/BinEditor.pluginspec
index 53fe757465378a3815fa032d4dcb3b4cab1bb6b6..b9e1d15fc0ae1e4baedeca039973d17e8575b794 100644
--- a/src/plugins/bineditor/BinEditor.pluginspec
+++ b/src/plugins/bineditor/BinEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="BinEditor" version="1.0.0" compatVersion="1.0.0">
+<plugin name="BinEditor" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Binary editor component.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="TextEditor" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="TextEditor" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec b/src/plugins/bookmarks/Bookmarks.pluginspec
index 3c85f931d375f889000acff0f5105e5afd2d07cb..5cdee7ae40d9cdedc5fe73a058d4019ac6147968 100644
--- a/src/plugins/bookmarks/Bookmarks.pluginspec
+++ b/src/plugins/bookmarks/Bookmarks.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Bookmarks" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Bookmarks" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Bookmarks in text editors.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
index da84e44e4d897939e0a0f5ffc3bddb40c5ecb84b..68840d33b3940da5a8ff2d521596f8f1fbd09e6e 100644
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CMakeProjectManager" version="1.0.0" compatVersion="1.0.0">
+<plugin name="CMakeProjectManager" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>CMake support</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="CppTools" version="1.0.0"/>
-        <dependency name="CppEditor" version="1.0.0"/>
-        <dependency name="Help" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="CppTools" version="1.0.80"/>
+        <dependency name="CppEditor" version="1.0.80"/>
+        <dependency name="Help" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/coreplugin/Core.pluginspec b/src/plugins/coreplugin/Core.pluginspec
index aacec63b9dcc70dcf8244c99e9f2b22658048cf8..848418c2688ccb9307a689041c37e7b7d9863874 100644
--- a/src/plugins/coreplugin/Core.pluginspec
+++ b/src/plugins/coreplugin/Core.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Core" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Core" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 32c05cd0a67198a00489634c493c136720aa8998..7afdde43663f8ae2003a9cd43a388cf449dee400 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -35,7 +35,7 @@ namespace Constants {
 
 #define IDE_VERSION_MAJOR 1
 #define IDE_VERSION_MINOR 0
-#define IDE_VERSION_RELEASE 0
+#define IDE_VERSION_RELEASE 80
 
 #define STRINGIFY_INTERNAL(x) #x
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 0e64fd98cb2e0d7aa7aaf5e5e3f53aec33368328..463ebf4390f61c422b1bbfeafafb459b96775122 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -70,8 +70,8 @@ OpenEditorsWidget::OpenEditorsWidget()
     m_ui.editorList->setModel(em->openedEditorsModel());
     connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)),
             this, SLOT(updateCurrentItem(Core::IEditor*)));
-    connect(m_ui.editorList, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
-            this, SLOT(selectEditor(QTreeWidgetItem*)));
+    connect(m_ui.editorList, SIGNAL(clicked(QModelIndex)),
+            this, SLOT(selectEditor(QModelIndex)));
     //updateEditorList();
 }
 
diff --git a/src/plugins/cpaster/CodePaster.pluginspec b/src/plugins/cpaster/CodePaster.pluginspec
index eed8a32a0b9645856a91e89848ebc8617b5d0bbd..28bfeb89ed20f6f2da3aec4a61bcc118317f9e4b 100644
--- a/src/plugins/cpaster/CodePaster.pluginspec
+++ b/src/plugins/cpaster/CodePaster.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CodePaster" version="1.0.0" compatVersion="1.0.0">
+<plugin name="CodePaster" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Codepaster plugin for pushing/fetching diff from server</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cppeditor/CppEditor.pluginspec b/src/plugins/cppeditor/CppEditor.pluginspec
index 0c7112e0b4c91bf41b50d342b4224a70f09455ef..8f80251789e722319521d26a7a24664f93fe3ee7 100644
--- a/src/plugins/cppeditor/CppEditor.pluginspec
+++ b/src/plugins/cppeditor/CppEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CppEditor" version="1.0.0" compatVersion="1.0.0">
+<plugin name="CppEditor" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>C/C++ editor component.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="CppTools" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="CppTools" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cpptools/CppTools.pluginspec b/src/plugins/cpptools/CppTools.pluginspec
index e77e88c9afcef2cad71145b0d93336e4e2aee08b..e2881a6ffadd60801b31c9032e1b0aae1774005b 100644
--- a/src/plugins/cpptools/CppTools.pluginspec
+++ b/src/plugins/cpptools/CppTools.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="CppTools" version="1.0.0" compatVersion="1.0.0">
+<plugin name="CppTools" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Tools for analyzing C/C++ code.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="QuickOpen" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="QuickOpen" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 5847d509e166420116d8df2812269cf7e25ca4de..3aa8136dff03acfaf9f7c3df391d7ca0fcaadad4 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -191,7 +191,8 @@ protected:
     virtual void macroAdded(const Macro &macro);
     virtual void startExpandingMacro(unsigned offset,
                                      const Macro &macro,
-                                     const QByteArray &originalText);
+                                     const QByteArray &originalText,
+                                     const QVector<MacroArgumentReference> &actuals);
     virtual void stopExpandingMacro(unsigned offset, const Macro &macro);
     virtual void startSkippingBlocks(unsigned offset);
     virtual void stopSkippingBlocks(unsigned offset);
@@ -404,13 +405,14 @@ void CppPreprocessor::macroAdded(const Macro &macro)
 
 void CppPreprocessor::startExpandingMacro(unsigned offset,
                                           const Macro &macro,
-                                          const QByteArray &originalText)
+                                          const QByteArray &originalText,
+                                          const QVector<MacroArgumentReference> &actuals)
 {
     if (! m_currentDoc)
         return;
 
     //qDebug() << "start expanding:" << macro.name << "text:" << originalText;
-    m_currentDoc->addMacroUse(macro, offset, originalText.length());
+    m_currentDoc->addMacroUse(macro, offset, originalText.length(), actuals);
 }
 
 void CppPreprocessor::stopExpandingMacro(unsigned, const Macro &)
@@ -544,7 +546,7 @@ CppModelManager::CppModelManager(QObject *parent)
     m_core = Core::ICore::instance(); // FIXME
     m_dirty = true;
 
-    ProjectExplorer::ProjectExplorerPlugin *pe = 
+    ProjectExplorer::ProjectExplorerPlugin *pe =
        ProjectExplorer::ProjectExplorerPlugin::instance();
 
     QTC_ASSERT(pe, return);
diff --git a/src/plugins/debugger/Debugger.pluginspec b/src/plugins/debugger/Debugger.pluginspec
index c9794c9e7b7f7c69ee81d0f92c2c43e67e52a8ef..e8dc76f9e62749b2ea8e5c9bb3d9b039ea316c30 100644
--- a/src/plugins/debugger/Debugger.pluginspec
+++ b/src/plugins/debugger/Debugger.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Debugger" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Debugger" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Debugger integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="CppEditor" version="1.0.0"/><!-- Debugger plugin adds items to the editor's context menu -->
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="Find" version="1.0.0"/>
+        <dependency name="CppEditor" version="1.0.80"/><!-- Debugger plugin adds items to the editor's context menu -->
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="Find" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/designer/Designer.pluginspec b/src/plugins/designer/Designer.pluginspec
index dc099be932b934046b8f3414b1dbebbd10123711..49cc22deaaaa8fd5e108d59058fbad700a399838 100644
--- a/src/plugins/designer/Designer.pluginspec
+++ b/src/plugins/designer/Designer.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Designer" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Designer" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Qt Designer integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
 <!-- For compiling with CPP support enabled -->
-        <dependency name="CppEditor" version="1.0.0"/>
+        <dependency name="CppEditor" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/fakevim/FakeVim.pluginspec b/src/plugins/fakevim/FakeVim.pluginspec
index f9d43ee22856285908dbf633b1c3360b07ede94d..92333f49f870daba781eea4a400e613518d04167 100644
--- a/src/plugins/fakevim/FakeVim.pluginspec
+++ b/src/plugins/fakevim/FakeVim.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="FakeVim" version="1.0.0" compatVersion="1.0.0">
+<plugin name="FakeVim" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>VI-style keyboard navigation.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="CppEditor" version="1.0.0"/><!-- Plugin adds items to the editor's context menu -->
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="CppEditor" version="1.0.80"/><!-- Plugin adds items to the editor's context menu -->
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/find/Find.pluginspec b/src/plugins/find/Find.pluginspec
index ce745ee786efa4fb4f8cbc3bb8570a9c339c8ee8..d8a3c653fb1e88167f8cff8da2b5d3824e85baf3 100644
--- a/src/plugins/find/Find.pluginspec
+++ b/src/plugins/find/Find.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Find" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Find" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides the find widget and the hooks for find implementations.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/git/ScmGit.pluginspec b/src/plugins/git/ScmGit.pluginspec
index 8107261315aec0d31f7b0535557ab38afd4be822..04fb4f8054299c425cd9bd9fc595fc6f0f7f645f 100644
--- a/src/plugins/git/ScmGit.pluginspec
+++ b/src/plugins/git/ScmGit.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="ScmGit" version="1.0.0" compatVersion="1.0.0">
+<plugin name="ScmGit" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Git integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
-	<dependency name="VCSBase" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
+	<dependency name="VCSBase" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/helloworld/HelloWorld.pluginspec b/src/plugins/helloworld/HelloWorld.pluginspec
index 220ee3e7e2f78dad6014a2ca6b2cf1ea5192a2af..834cabfd9b9eff9929434902c0ce7a63d28c8f0b 100644
--- a/src/plugins/helloworld/HelloWorld.pluginspec
+++ b/src/plugins/helloworld/HelloWorld.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="HelloWorld" version="1.0.0" compatVersion="1.0.0">
+<plugin name="HelloWorld" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Hello World sample plugin.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/help/Help.pluginspec b/src/plugins/help/Help.pluginspec
index fd8ef75f1969de94c4c5ce28db74f9ceb7be9312..811c87b05db8f24d00052949e416d564e4cd0119 100644
--- a/src/plugins/help/Help.pluginspec
+++ b/src/plugins/help/Help.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Help" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Help" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Help system.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="Find" version="1.0.0"/>
-        <dependency name="QuickOpen" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="Find" version="1.0.80"/>
+        <dependency name="QuickOpen" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/perforce/Perforce.pluginspec b/src/plugins/perforce/Perforce.pluginspec
index cacaf3bc3a98c87792785f37d1a4be5b43aa3bdb..8ba1f9a6e18ebd63f9461b5d48daa8c9c833c2c6 100644
--- a/src/plugins/perforce/Perforce.pluginspec
+++ b/src/plugins/perforce/Perforce.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Perforce" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Perforce" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Perforce integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
-	<dependency name="VCSBase" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
+	<dependency name="VCSBase" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
index dcdd039dd890c39bb79b842145b00247b79e4c4f..bc4e4323cf3b3feb9d6303aaf60e1c610d8160e8 100644
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="ProjectExplorer" version="1.0.0" compatVersion="1.0.0">
+<plugin name="ProjectExplorer" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="Find" version="1.0.0"/>
-        <dependency name="QuickOpen" version="1.0.0"/>
-        <dependency name="TextEditor" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="Find" version="1.0.80"/>
+        <dependency name="QuickOpen" version="1.0.80"/>
+        <dependency name="TextEditor" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
index a2e7303d9cd0832001db4c9005d74518cadd64e2..d7b4033108b08a6c8597871800272ddec6e46331 100644
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Qt4ProjectManager" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Qt4ProjectManager" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides project type for Qt 4 pro files and tools.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="CppTools" version="1.0.0"/>
-        <dependency name="CppEditor" version="1.0.0"/>
-        <dependency name="Help" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="CppTools" version="1.0.80"/>
+        <dependency name="CppEditor" version="1.0.80"/>
+        <dependency name="Help" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
index b1a913245dd73ee2e38cdee07bcc2cf46d8034a5..bd2c6da8b7c545e99564db604fff22167013bfce 100644
--- a/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
+++ b/src/plugins/qtscripteditor/QtScriptEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QtScriptEditor" version="1.0.0" compatVersion="1.0.0">
+<plugin name="QtScriptEditor" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for QtScript.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="TextEditor" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="TextEditor" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/quickopen/QuickOpen.pluginspec b/src/plugins/quickopen/QuickOpen.pluginspec
index c3084574e63b77082b1adb0ec8fd6a016d3596ad..47eed4d0f4d563c24322d33403160530c02b6375 100644
--- a/src/plugins/quickopen/QuickOpen.pluginspec
+++ b/src/plugins/quickopen/QuickOpen.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="QuickOpen" version="1.0.0" compatVersion="1.0.0">
+<plugin name="QuickOpen" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Provides the QuickOpen widget and the hooks for QuickOpen filter implementations.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/regexp/RegExp.pluginspec b/src/plugins/regexp/RegExp.pluginspec
index b7ddcf4e6b5ab8a910496f4578ea7fd4c6566343..7105065544e80bc2bbc1f4c7b5fee8307931b943 100644
--- a/src/plugins/regexp/RegExp.pluginspec
+++ b/src/plugins/regexp/RegExp.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="RegExp" version="1.0.0" compatVersion="1.0.0">
+<plugin name="RegExp" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Regular Expression test widget.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec b/src/plugins/resourceeditor/ResourceEditor.pluginspec
index 0ad3eb0c04cdbe8d7e6ee6347cbc023bf568d687..d19330439f32ee81b6c99e668fa9c75d77fb4e83 100644
--- a/src/plugins/resourceeditor/ResourceEditor.pluginspec
+++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="ResourceEditor" version="1.0.0" compatVersion="1.0.0">
+<plugin name="ResourceEditor" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Editor for qrc files.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/snippets/Snippets.pluginspec b/src/plugins/snippets/Snippets.pluginspec
index 589f15f7d0a02d3797a1767b7d797b2e641e3f94..79a1cf19ded74764f92309d89ef3ea83b560c472 100644
--- a/src/plugins/snippets/Snippets.pluginspec
+++ b/src/plugins/snippets/Snippets.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Snippets" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Snippets" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Code snippet plugin.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/subversion/Subversion.pluginspec b/src/plugins/subversion/Subversion.pluginspec
index ab7fd190fdcb48f5175c708c22941679622c6208..ec94605f0ae46b8e92cac4df3da2dfbf7940941f 100644
--- a/src/plugins/subversion/Subversion.pluginspec
+++ b/src/plugins/subversion/Subversion.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="Subversion" version="1.0.0" compatVersion="1.0.0">
+<plugin name="Subversion" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Subversion integration.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
-        <dependency name="Core" version="1.0.0"/>
-	<dependency name="VCSBase" version="1.0.0"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
+        <dependency name="Core" version="1.0.80"/>
+	<dependency name="VCSBase" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/texteditor/TextEditor.pluginspec b/src/plugins/texteditor/TextEditor.pluginspec
index df65b6f93f9c7fe5bf626f094c82489d4b9c3b63..fae904216ce8d637535a64a07bc1740043f76a21 100644
--- a/src/plugins/texteditor/TextEditor.pluginspec
+++ b/src/plugins/texteditor/TextEditor.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="TextEditor" version="1.0.0" compatVersion="1.0.0">
+<plugin name="TextEditor" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Text editor framework and the implementation of the basic text editor.</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="Find" version="1.0.0"/>
-        <dependency name="QuickOpen" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="Find" version="1.0.80"/>
+        <dependency name="QuickOpen" version="1.0.80"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec b/src/plugins/vcsbase/VCSBase.pluginspec
index 7f32f5bf7599c3c8deaa2062eafac4b0d8161258..b97b0c5244b6c8853ceed2993affa57f909418ac 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec
+++ b/src/plugins/vcsbase/VCSBase.pluginspec
@@ -1,4 +1,4 @@
-<plugin name="VCSBase" version="1.0.0" compatVersion="1.0.0">
+<plugin name="VCSBase" version="1.0.80" compatVersion="1.0.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2008-2009 Nokia Corporation</copyright>
     <license>
@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
     <description>Version Control System Base Plugin</description>
     <url>http://www.qtsoftware.com</url>
     <dependencyList>
-        <dependency name="Core" version="1.0.0"/>
-        <dependency name="TextEditor" version="1.0.0"/>
-        <dependency name="ProjectExplorer" version="1.0.0"/>
+        <dependency name="Core" version="1.0.80"/>
+        <dependency name="TextEditor" version="1.0.80"/>
+        <dependency name="ProjectExplorer" version="1.0.80"/>
     </dependencyList>
 </plugin>