Merge branch 'reviews/1516'

* reviews/1516:
  Adding License to mecurial plugin
  Mercurial plugin, merge request with suggested fixes.

Conflicts:
	src/plugins/plugins.pro
	src/plugins/vcsbase/basecheckoutwizardpage.ui

diff --cc src/plugins/plugins.pro
index c74bda1,df53ea3..77cf85e
--- 1/src/plugins/plugins.pro
--- 2/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@@ -32,8 -32,9 +32,9 @@@ SUBDIRS   = plugin_coreplugin 
              plugin_designer \
              plugin_resourceeditor \
              plugin_genericprojectmanager \
 -            plugin_duieditor \
 +            plugin_qmleditor \
              plugin_qmlprojectmanager \
+             plugin_mercurial \
              debugger/dumper.pro
  
  plugin_coreplugin.subdir = coreplugin
@@@ -177,4 -177,10 +178,10 @@@ plugin_qmlprojectmanager.subdir = qmlpr
  plugin_qmlprojectmanager.depends = plugin_texteditor
  plugin_qmlprojectmanager.depends += plugin_projectexplorer
  plugin_qmlprojectmanager.depends += plugin_help
 -plugin_qmlprojectmanager.depends += plugin_duieditor
 +plugin_qmlprojectmanager.depends += plugin_qmleditor
+ 
+ plugin_mercurial.subdir = mercurial
+ plugin_mercurial.depends = plugin_texteditor
+ plugin_mercurial.depends = plugin_vcsbase
+ plugin_mercurial.depends += plugin_projectexplorer
+ plugin_mercurial.depends += plugin_coreplugin

diff --cc src/plugins/vcsbase/basecheckoutwizardpage.ui
index 7be84e6,dc8a3b8..6dc045d
--- 1/src/plugins/vcsbase/basecheckoutwizardpage.ui
--- 2/src/plugins/vcsbase/basecheckoutwizardpage.ui
+++ b/src/plugins/vcsbase/basecheckoutwizardpage.ui
@@@ -29,6 -29,9 +29,9 @@@
         </property>
        </widget>
       </item>
 -      <widget class="Core::Utils::ProjectNameValidatingLineEdit" name="checkoutDirectoryLineEdit"/>
+      <item row="1" column="1">
++      <widget class="Utils::ProjectNameValidatingLineEdit" name="checkoutDirectoryLineEdit"/>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="pathLabel">
         <property name="text">
@@@ -37,11 -40,8 +40,8 @@@
        </widget>
       </item>
       <item row="2" column="1">
 -      <widget class="Core::Utils::PathChooser" name="pathChooser"/>
 +      <widget class="Utils::PathChooser" name="pathChooser"/>
       </item>
-      <item row="1" column="1">
-       <widget class="Utils::ProjectNameValidatingLineEdit" name="checkoutDirectoryLineEdit"/>
-      </item>
      </layout>
     </item>
    </layout>