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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move the mimetypes to KCoreAddons
From:       Kevin Ottens <ervin+bluesystems () kde ! org>
Date:       2013-08-19 14:08:42
Message-ID: E1VBQ8Q-0006Mq-Ja () scm ! kde ! org
[Download RAW message or body]

Git commit 39838e64a7310fa78c19849e335045553c202b8a by Kevin Ottens.
Committed on 19/08/2013 at 08:28.
Pushed by ervin into branch 'frameworks'.

Move the mimetypes to KCoreAddons

They go well in there as they augment what QMimeTypes knows about.

M  +0    -1    CMakeLists.txt
M  +0    -1    cmake/modules/CMakeLists.txt
R  +0    -0    tier1/kcoreaddons/cmake/FindSharedMimeInfo.cmake [from: cmak=
e/modules/FindSharedMimeInfo.cmake - 100% similarity]
M  +1    -0    tier1/kcoreaddons/src/CMakeLists.txt
R  +0    -0    tier1/kcoreaddons/src/mimetypes/CMakeLists.txt [from: mimety=
pes/CMakeLists.txt - 100% similarity]
R  +0    -0    tier1/kcoreaddons/src/mimetypes/XmlMessages.sh [from: mimety=
pes/XmlMessages.sh - 100% similarity]
R  +0    -0    tier1/kcoreaddons/src/mimetypes/kde.xml [from: mimetypes/kde=
.xml - 100% similarity]

http://commits.kde.org/kdelibs/39838e64a7310fa78c19849e335045553c202b8a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e217f11..20e7e9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,7 +201,6 @@ if(NOT WINCE)
   endif()
 endif(NOT WINCE)
 add_subdirectory( licenses   )
-add_subdirectory( mimetypes  )
 #add_subdirectory( kdeui )
 add_subdirectory( dnssd )
 add_subdirectory( kio )
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index a0cda22..522599d 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -76,7 +76,6 @@ set(cmakeFiles
                FindSamba.cmake
                FindSane.cmake
                FindSasl2.cmake
-               FindSharedMimeInfo.cmake
                FindSharedDesktopOntologies.cmake
                FindSqlite.cmake
                FindTaglib.cmake
diff --git a/cmake/modules/FindSharedMimeInfo.cmake b/tier1/kcoreaddons/cma=
ke/FindSharedMimeInfo.cmake
similarity index 100%
rename from cmake/modules/FindSharedMimeInfo.cmake
rename to tier1/kcoreaddons/cmake/FindSharedMimeInfo.cmake
diff --git a/tier1/kcoreaddons/src/CMakeLists.txt b/tier1/kcoreaddons/src/C=
MakeLists.txt
index 3ea7a41..ef1eea6 100644
--- a/tier1/kcoreaddons/src/CMakeLists.txt
+++ b/tier1/kcoreaddons/src/CMakeLists.txt
@@ -1 +1,2 @@
 add_subdirectory(lib)
+add_subdirectory(mimetypes)
diff --git a/mimetypes/CMakeLists.txt b/tier1/kcoreaddons/src/mimetypes/CMa=
keLists.txt
similarity index 100%
rename from mimetypes/CMakeLists.txt
rename to tier1/kcoreaddons/src/mimetypes/CMakeLists.txt
diff --git a/mimetypes/XmlMessages.sh b/tier1/kcoreaddons/src/mimetypes/Xml=
Messages.sh
similarity index 100%
rename from mimetypes/XmlMessages.sh
rename to tier1/kcoreaddons/src/mimetypes/XmlMessages.sh
diff --git a/mimetypes/kde.xml b/tier1/kcoreaddons/src/mimetypes/kde.xml
similarity index 100%
rename from mimetypes/kde.xml
rename to tier1/kcoreaddons/src/mimetypes/kde.xml

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