summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2012-02-24 15:12:05 +0100
committerhjk <qthjk@ovi.com>2012-02-24 16:35:30 +0100
commitde7f77e219240502199a555438140411d253dd01 (patch)
treee301d16d192e8a82fa72dc394399a7f59ae420df /src
parent75c20e4dce0c53cfb5c860fedf165af01acbc66b (diff)
downloadqt-creator-de7f77e219240502199a555438140411d253dd01.tar.gz
vcsbase: rename VCSBase into VcsBase
Note that this changes the name of the plugin .so. you might have to remove your old one manually. Change-Id: Icb6c4ff5455aad40182dfcd00a64d80c424c11b7 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/bazaar/Bazaar.pluginspec.in2
-rw-r--r--src/plugins/bazaar/bazaar.qbs2
-rw-r--r--src/plugins/cvs/CVS.pluginspec.in2
-rw-r--r--src/plugins/cvs/cvs.qbs2
-rw-r--r--src/plugins/git/ScmGit.pluginspec.in2
-rw-r--r--src/plugins/git/git.qbs2
-rw-r--r--src/plugins/mercurial/Mercurial.pluginspec.in2
-rw-r--r--src/plugins/mercurial/mercurial.qbs2
-rw-r--r--src/plugins/perforce/Perforce.pluginspec.in2
-rw-r--r--src/plugins/perforce/perforce.qbs2
-rw-r--r--src/plugins/subversion/Subversion.pluginspec.in2
-rw-r--r--src/plugins/subversion/subversion.qbs2
-rw-r--r--src/plugins/vcsbase/VcsBase.mimetypes.xml (renamed from src/plugins/vcsbase/VCSBase.mimetypes.xml)0
-rw-r--r--src/plugins/vcsbase/VcsBase.pluginspec.in (renamed from src/plugins/vcsbase/VCSBase.pluginspec.in)2
-rw-r--r--src/plugins/vcsbase/vcsbase.pri2
-rw-r--r--src/plugins/vcsbase/vcsbase.pro2
-rw-r--r--src/plugins/vcsbase/vcsbase.qbs4
-rw-r--r--src/plugins/vcsbase/vcsbase.qrc2
-rw-r--r--src/plugins/vcsbase/vcsplugin.cpp2
19 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/bazaar/Bazaar.pluginspec.in b/src/plugins/bazaar/Bazaar.pluginspec.in
index 4141be4748..a3f95751c3 100644
--- a/src/plugins/bazaar/Bazaar.pluginspec.in
+++ b/src/plugins/bazaar/Bazaar.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 01548243df..8767e25cf4 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
- Depends { name: "VCSBase" }
+ Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/cvs/CVS.pluginspec.in b/src/plugins/cvs/CVS.pluginspec.in
index b63dffa7d6..8f226c98b4 100644
--- a/src/plugins/cvs/CVS.pluginspec.in
+++ b/src/plugins/cvs/CVS.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 643a1ffd04..b458ae5c9d 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "find" }
- Depends { name: "VCSBase" }
+ Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/git/ScmGit.pluginspec.in b/src/plugins/git/ScmGit.pluginspec.in
index 46f4977cf5..0f987dfc16 100644
--- a/src/plugins/git/ScmGit.pluginspec.in
+++ b/src/plugins/git/ScmGit.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 6c5f20ec58..e4a9342703 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "find" }
- Depends { name: "VCSBase" }
+ Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/mercurial/Mercurial.pluginspec.in b/src/plugins/mercurial/Mercurial.pluginspec.in
index 8ff246b0de..771008c2fb 100644
--- a/src/plugins/mercurial/Mercurial.pluginspec.in
+++ b/src/plugins/mercurial/Mercurial.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 21a8a5c976..6d1a81aba6 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "find" }
- Depends { name: "VCSBase" }
+ Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/perforce/Perforce.pluginspec.in b/src/plugins/perforce/Perforce.pluginspec.in
index 8e03fc0317..3c47e44069 100644
--- a/src/plugins/perforce/Perforce.pluginspec.in
+++ b/src/plugins/perforce/Perforce.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index b396e5eb4e..8b5d84dbd2 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "find" }
- Depends { name: "VCSBase" }
+ Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/subversion/Subversion.pluginspec.in b/src/plugins/subversion/Subversion.pluginspec.in
index 3bd3969854..f6ae84e94e 100644
--- a/src/plugins/subversion/Subversion.pluginspec.in
+++ b/src/plugins/subversion/Subversion.pluginspec.in
@@ -17,6 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- <dependency name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin>
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 110a014351..471e8eb7ba 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "find" }
- Depends { name: "VCSBase" }
+ Depends { name: "VcsBase" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/vcsbase/VCSBase.mimetypes.xml b/src/plugins/vcsbase/VcsBase.mimetypes.xml
index 3b48f22206..3b48f22206 100644
--- a/src/plugins/vcsbase/VCSBase.mimetypes.xml
+++ b/src/plugins/vcsbase/VcsBase.mimetypes.xml
diff --git a/src/plugins/vcsbase/VCSBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in
index f39b851d45..276ae7e0dd 100644
--- a/src/plugins/vcsbase/VCSBase.pluginspec.in
+++ b/src/plugins/vcsbase/VcsBase.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name=\"VCSBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+<plugin name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2011 Nokia Corporation</copyright>
<license>
diff --git a/src/plugins/vcsbase/vcsbase.pri b/src/plugins/vcsbase/vcsbase.pri
index 7ac74218c8..17708695d7 100644
--- a/src/plugins/vcsbase/vcsbase.pri
+++ b/src/plugins/vcsbase/vcsbase.pri
@@ -1,3 +1,3 @@
include(vcsbase_dependencies.pri)
-LIBS *= -l$$qtLibraryName(VCSBase)
+LIBS *= -l$$qtLibraryName(VcsBase)
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index 5c377dc70e..a50c97676a 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-TARGET = VCSBase
+TARGET = VcsBase
DEFINES += VCSBASE_LIBRARY QT_NO_CAST_FROM_ASCII
include(../../qtcreatorplugin.pri)
include(vcsbase_dependencies.pri)
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 194135f58f..fcbcdc660a 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -3,7 +3,7 @@ import qbs.base 1.0
import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
- name: "VCSBase"
+ name: "VcsBase"
Depends { name: "aggregation" } // ### should be injected by product dependency "Core"
Depends { name: "extensionsystem" } // ### should be injected by product dependency "Core"
@@ -25,7 +25,7 @@ QtcPlugin {
]
files: [
- "VCSBase.mimetypes.xml",
+ "VcsBase.mimetypes.xml",
"vcsbase.qrc",
"vcsbase_global.h",
"baseannotationhighlighter.cpp",
diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc
index f4fa641bf5..4da5d9ca9f 100644
--- a/src/plugins/vcsbase/vcsbase.qrc
+++ b/src/plugins/vcsbase/vcsbase.qrc
@@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/vcsbase" >
- <file>VCSBase.mimetypes.xml</file>
+ <file>VcsBase.mimetypes.xml</file>
<file>images/diff.png</file>
<file>images/submit.png</file>
</qresource>
diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp
index f518994bf2..f7e457a4eb 100644
--- a/src/plugins/vcsbase/vcsplugin.cpp
+++ b/src/plugins/vcsbase/vcsplugin.cpp
@@ -67,7 +67,7 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
- if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VCSBase.mimetypes.xml"), errorMessage))
+ if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VcsBase.mimetypes.xml"), errorMessage))
return false;
m_coreListener = new CoreListener;