Merge remote-tracking branch 'origin/Applications/15.08'

11 years ago · a475a7570c
parent dde68921b6 4fee5131e9
commit a475a7570c
2 changed files with 2 additions and 2 deletions
--- a/conf/okular_core.kcfg
+++ b/conf/okular_core.kcfg
@ -76,7 +76,7 @@
   </choices>
  </entry>
  <entry key="ExternalEditorCommand" type="String">
-    <default>kate --use --line %l --column %c</default>
+    <default>kate --line %l --column %c</default>
  </entry>
 </group>
 <group name="Core Presentation" >
--- a/core/texteditors_p.h
+++ b/core/texteditors_p.h
@ -22,7 +22,7 @@ static inline QHash< int, QString > buildEditorsMap()
 {
    QHash< int, QString > editors;
    editors.insert( SettingsCore::EnumExternalEditor::Kate,
-        QString::fromLatin1( "kate --use --line %l --column %c" ) );
+        QString::fromLatin1( "kate --line %l --column %c" ) );
    editors.insert( SettingsCore::EnumExternalEditor::Kile,
        QString::fromLatin1( "kile --line %l" ) );
    editors.insert( SettingsCore::EnumExternalEditor::Scite,