[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kdelibs-bugs
Subject:    [frameworks-kio] [Bug 353642] kio master conflicts kde-baseapps 15.08.x
From:       David Faure via KDE Bugzilla <bugzilla_noreply () kde ! org>
Date:       2015-11-03 9:45:01
Message-ID: bug-353642-90985-uPa2EAZpF4 () http ! bugs ! kde ! org/
[Download RAW message or body]

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

David Faure <faure@kde.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
      Latest Commit|                            |http://commits.kde.org/kio/
                   |                            |6ec29b03e4433c93bf5c2e5da97
                   |                            |7d019440020a9
             Status|CONFIRMED                   |RESOLVED

--- Comment #11 from David Faure <faure@kde.org> ---
Git commit 6ec29b03e4433c93bf5c2e5da977d019440020a9 by David Faure.
Committed on 03/11/2015 at 09:44.
Pushed by dfaure into branch 'master'.

Ship the "new file templates" in the kiofilewidgets library using a .qrc

This solves the conflict with kde-baseapps 15.08.x, and simplifies deployment
on Win/Mac.
REVIEW: 125928
Change-Id: Id4f9e364ceeea6b1b93910aa100ff22ce3fd76a7

M  +2    -2    autotests/knewfilemenutest.cpp
M  +0    -1    src/CMakeLists.txt
M  +2    -0    src/filewidgets/CMakeLists.txt
M  +13   -3    src/filewidgets/knewfilemenu.cpp
D  +0    -20   src/new_file_templates/CMakeLists.txt
A  +18   -0    src/new_file_templates/templates.qrc

http://commits.kde.org/kio/6ec29b03e4433c93bf5c2e5da977d019440020a9

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Kdelibs-bugs mailing list
Kdelibs-bugs@kde.org
https://mail.kde.org/mailman/listinfo/kdelibs-bugs

[prev in list] [next in list] [prev in thread] [next in thread]