From: Ivailo Monev Date: Fri, 22 Apr 2016 23:21:19 +0000 (+0000) Subject: ark: fix warning about null entry since 51d24304 X-Git-Tag: 4.22.0~861 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82907eecca6834d7eafe818cabc1b48de8ffc44a;p=kde%2Fkde-extraapps.git ark: fix warning about null entry since 51d24304 Signed-off-by: Ivailo Monev --- diff --git a/ark/plugins/libarchive/CMakeLists.txt b/ark/plugins/libarchive/CMakeLists.txt index ded2dba7..74cd5967 100644 --- a/ark/plugins/libarchive/CMakeLists.txt +++ b/ark/plugins/libarchive/CMakeLists.txt @@ -5,12 +5,12 @@ set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-archive;application/x set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip;application/x-gzip;application/x-bzip-compressed-tar;application/x-gzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/x-java-archive;application/zip;application/x-7z-compressed;") if("${LibArchive_VERSION}" VERSION_GREATER "3.0.4") - set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES};application/x-lzop;") - set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES};application/x-lzop;") + set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-lzop;") + set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lzop;") endif() if("${LibArchive_VERSION}" VERSION_GREATER "3.1.2") - set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES};application/x-lz4;") - set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES};application/x-lz4;") + set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-lz4;") + set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lz4;") endif() configure_file( diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt index 6b972ffc..d7ea9e95 100644 --- a/kgpg/CMakeLists.txt +++ b/kgpg/CMakeLists.txt @@ -112,22 +112,6 @@ set(kgpg_SRCS ${core_SRCS} ${kgpg_editor_SRCS} ${kgpg_model_SRCS} ${kgpg_transac caff.cpp foldercompressjob.cpp misc.cpp - adduid.ui - conf_gpg.ui - searchres.ui - groupedit.ui - conf_ui2.ui - conf_servers.ui - conf_misc.ui - newkey.ui - keyexport.ui - conf_encryption.ui - kgpgKeyInfo.ui - kgpgkeygenerate.ui - kgpgrevokewidget.ui - keyserver.ui - conf_decryption.ui - sourceselect.ui ) qt4_add_dbus_adaptor( kgpg_SRCS org.kde.kgpg.Key.xml keysmanager.h KeysManager)