[k3b] [Bug 366226] Conflicting declaration KSharedConfigPtr

[Leslie Zhai via KDE Bugzilla]

https://bugs.kde.org/show_bug.cgi?id=366226

--- Comment #3 from Leslie Zhai <xiangzhai83 at gmail.com> ---
Git commit 4fba5b5b54e7265a61a1460e3a433f14b4929a50 by Leslie Zhai.
Committed on 29/07/2016 at 03:34.
Pushed by lesliezhai into branch 'kf5'.

*P.L.E.A.S.E D.O N.O.T R.E.V.E.R.T I.T*

Prepare for KF5Cddb

There is an agreement for Application/16.08 freeze, after August 12, go for it,
then libkcddb will be merged to UPSTREAM repoistory, but at present I
have to maintain it in unofficial place temporarily waitting for next
freeze plan.
https://mail.kde.org/pipermail/release-team/2016-July/009628.html

Please test it before git push, thanks a lot!

CCMAIL: johannesobermayr at gmx.de

M  +9    -6    CMakeLists.txt
M  +1    -1    libk3b/CMakeLists.txt
M  +2    -2    libk3b/jobs/k3bcdcopyjob.cpp
M  +1    -1    libk3b/jobs/k3bcdcopyjob.h
M  +1    -1    libk3b/projects/audiocd/k3baudiocdtrackdrag.h
M  +1    -1    libk3b/tools/k3bcddb.cpp
M  +2    -2    libk3b/tools/k3bcddb.h
M  +1    -1    libk3b/tools/k3bmediacache.cpp
M  +1    -1    libk3b/tools/k3bmedium.cpp
M  +1    -1    libk3b/tools/k3bmedium_p.h
M  +1    -1    plugins/project/audioprojectcddb/CMakeLists.txt
M  +1    -1    plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp
M  +1    -1    src/CMakeLists.txt
M  +1    -1    src/k3bdiskinfoview.cpp
M  +3    -3    src/rip/k3baudiocdview.cpp
M  +1    -1    src/rip/k3baudioprojectconvertingdialog.cpp
M  +1    -1    src/rip/k3baudioprojectconvertingjob.cpp
M  +1    -1    src/rip/k3baudioripjob.cpp
M  +1    -1    src/rip/k3baudiorippingdialog.h
M  +1    -1    src/rip/k3baudiotrackmodel.cpp
M  +1    -1    src/rip/k3bmassaudioencodingjob.cpp
M  +1    -1    src/rip/k3bpatternparser.cpp

http://commits.kde.org/k3b/4fba5b5b54e7265a61a1460e3a433f14b4929a50

-- 
You are receiving this mail because:
You are the assignee for the bug.