From kde-commits  Mon Oct 31 02:39:17 2016
From: Leslie Zhai <xiangzhai83 () gmail ! com>
Date: Mon, 31 Oct 2016 02:39:17 +0000
To: kde-commits
Subject: [k3b] /: Update ChangeLog and fix some setUrl issues.
Message-Id: <E1c12VJ-0001Vf-Ga () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147788156806050

Git commit ee14fa1fc1e51a02b1ff775915bd9c4ca4db92c3 by Leslie Zhai.
Committed on 31/10/2016 at 02:38.
Pushed by lesliezhai into branch 'master'.

Update ChangeLog and fix some setUrl issues.

M  +16   -0    ChangeLog
M  +2    -2    src/rip/videodvd/k3bvideodvdrippingdialog.cpp

http://commits.kde.org/k3b/ee14fa1fc1e51a02b1ff775915bd9c4ca4db92c3

diff --git a/ChangeLog b/ChangeLog
index 0691ab7..c30b65b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2.10.0
+=3D=3D=3D=3D=3D=3D
+Changes:
+ * Deprecated transcode - tried to PR but unmaintained by upstream (BUG: 3=
60170)
+
+Bugfixes:
+ * Fixed compilation on newer ffmpeg/libav - test 57.56.100 (REVIEW: 12256=
9)
+ * Fixed invalid QUrl when burning iso - imageFilesize QUrl and QString
+ filePath wrong convertion issue (BUG: 365089)
+ * Fixed multisession issue - but *NO* Blu-Ray test environment (BUG: 3676=
39)
+ * Fixed crashed when adding a directory to a project - forget to check
+ newName.isEmpty (BUG: 349160)
+ * Fixed can't burn BD50 ISO image - seems not to be a usable image (BUG:
+ 344392)
+ * Fixed from2Byte *NO* checking nullptr issue (BUG: 328529)
+
 2.1
 =3D=3D=3D=3D
 Changes:
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videod=
vd/k3bvideodvdrippingdialog.cpp
index 2ed76c3..bea92dd 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -446,7 +446,7 @@ void K3b::VideoDVDRippingDialog::slotAudioModelChanged(=
 const QModelIndex& topLe
 =

 void K3b::VideoDVDRippingDialog::setBaseDir( const QString& path )
 {
-    d->w->m_editBaseDir->setUrl( path );
+    d->w->m_editBaseDir->setUrl(QUrl::fromLocalFile(path));
 }
 =

 =

@@ -464,7 +464,7 @@ void K3b::VideoDVDRippingDialog::loadSettings( const KC=
onfigGroup& c )
     d->w->m_checkBlankReplace->setChecked( c.readEntry( "replace blanks", =
false ) );
     d->w->m_editBlankReplace->setText( c.readEntry( "blank replace string"=
, "_" ) );
     d->w->m_comboFilenamePattern->setEditText( c.readEntry( "filename patt=
ern", d->w->m_comboFilenamePattern->itemText(0) ) );
-    d->w->m_editBaseDir->setUrl( c.readPathEntry( "base dir", K3b::default=
TempPath() ) );
+    d->w->m_editBaseDir->setUrl(QUrl::fromLocalFile(c.readPathEntry("base =
dir", K3b::defaultTempPath())));
 }
 =

=20