feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-07-31 10:59:24 +02:00
parent 5331f799a2 26bd1860d1
commit 9b3f183568
147 changed files with 769 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/CppTools.pluginspec.in
View File

@@ -1,6 +1,6 @@
<plugin name=\"CppTools\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2011 Nokia Corporation</copyright>
<copyright>(C) 2012 Nokia Corporation</copyright>
<license>
Commercial Usage
@@ -12,7 +12,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
</license>
<category>C++</category>
<description>Tools for analyzing C/C++ code.</description>
<url>http://qt.nokia.com</url>
<url>http://www.qt-project.org</url>
<dependencyList>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>