5 files changed, 26 insertions, 7 deletions
diff --git a/src/plugins/bazaar/CMakeLists.txt b/src/plugins/bazaar/CMakeLists.txt
new file mode 100644
index 0000000000..145323c42a
--- /dev/null
+++ b/src/plugins/bazaar/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_qtc_plugin(Bazaar
+  PLUGIN_DEPENDS Core TextEditor VcsBase
+  SOURCES
+    annotationhighlighter.cpp annotationhighlighter.h
+    bazaarclient.cpp bazaarclient.h
+    bazaarcommitpanel.ui
+    bazaarcommitwidget.cpp bazaarcommitwidget.h
+    bazaarcontrol.cpp bazaarcontrol.h
+    bazaareditor.cpp bazaareditor.h
+    bazaarplugin.cpp bazaarplugin.h
+    bazaarsettings.cpp bazaarsettings.h
+    branchinfo.cpp branchinfo.h
+    commiteditor.cpp commiteditor.h
+    constants.h
+    optionspage.cpp optionspage.h optionspage.ui
+    pullorpushdialog.cpp pullorpushdialog.h pullorpushdialog.ui
+    revertdialog.ui
+    uncommitdialog.cpp uncommitdialog.h uncommitdialog.ui
+)
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index f9941b2966..a60c7f331e 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -178,7 +178,7 @@ VcsBaseEditorWidget *BazaarClient::annotate(
                                    QStringList(extraOptions) << QLatin1String("--long"));
 }
 
-bool BazaarClient::isVcsDirectory(const FileName &fileName) const
+bool BazaarClient::isVcsDirectory(const FilePath &fileName) const
 {
     return fileName.toFileInfo().isDir()
             && !fileName.fileName().compare(Constants::BAZAARREPO, HostOsInfo::fileNameCaseSensitivity());
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 21750daf22..78d1ca5b35 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -52,7 +52,7 @@ public:
     VcsBase::VcsBaseEditorWidget *annotate(
             const QString &workingDir, const QString &file, const QString &revision = QString(),
             int lineNumber = -1, const QStringList &extraOptions = QStringList()) override;
-    bool isVcsDirectory(const Utils::FileName &fileName) const;
+    bool isVcsDirectory(const Utils::FilePath &fileName) const;
     QString findTopLevelForFile(const QFileInfo &file) const override;
     bool managesFile(const QString &workingDirectory, const QString &fileName) const;
     void view(const QString &source, const QString &id,
diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp
index 3db806cf0c..7b38aa971c 100644
--- a/src/plugins/bazaar/bazaarcontrol.cpp
+++ b/src/plugins/bazaar/bazaarcontrol.cpp
@@ -52,7 +52,7 @@ Core::Id BazaarControl::id() const
     return Core::Id(VcsBase::Constants::VCS_ID_BAZAAR);
 }
 
-bool BazaarControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const
+bool BazaarControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
 {
     return m_bazaarClient->isVcsDirectory(fileName);
 }
@@ -73,7 +73,7 @@ bool BazaarControl::managesFile(const QString &workingDirectory, const QString &
 
 bool BazaarControl::isConfigured() const
 {
-    const Utils::FileName binary = m_bazaarClient->vcsBinary();
+    const Utils::FilePath binary = m_bazaarClient->vcsBinary();
     if (binary.isEmpty())
         return false;
     QFileInfo fi = binary.toFileInfo();
@@ -139,7 +139,7 @@ bool BazaarControl::vcsAnnotate(const QString &file, int line)
 }
 
 Core::ShellCommand *BazaarControl::createInitialCheckoutCommand(const QString &url,
-                                                                const Utils::FileName &baseDirectory,
+                                                                const Utils::FilePath &baseDirectory,
                                                                 const QString &localName,
                                                                 const QStringList &extraArgs)
 {
diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h
index ced12c9a79..d0d5b514d6 100644
--- a/src/plugins/bazaar/bazaarcontrol.h
+++ b/src/plugins/bazaar/bazaarcontrol.h
@@ -48,7 +48,7 @@ public:
     QString displayName() const final;
     Core::Id id() const final;
 
-    bool isVcsFileOrDirectory(const Utils::FileName &fileName) const final;
+    bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
 
     bool managesDirectory(const QString &filename, QString *topLevel = nullptr) const final;
     bool managesFile(const QString &workingDirectory, const QString &fileName) const final;
@@ -62,7 +62,7 @@ public:
     bool vcsAnnotate(const QString &file, int line) final;
 
     Core::ShellCommand *createInitialCheckoutCommand(const QString &url,
-                                                     const Utils::FileName &baseDirectory,
+                                                     const Utils::FilePath &baseDirectory,
                                                      const QString &localName,
                                                      const QStringList &extraArgs) final;