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

List:       kde-commits
Subject:    [kio-extras] thumbnail: Enable Windows ICO and EXE thumbnails again.
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2016-04-23 15:21:25
Message-ID: E1atzN7-0005Gt-5w () scm ! kde ! org
[Download RAW message or body]

Git commit fe9116847d6f2e36c1ec04e2af0cfac2553336fd by Andrius da Costa Rib=
as.
Committed on 22/04/2016 at 19:56.
Pushed by andriusr into branch 'master'.

Enable Windows ICO and EXE thumbnails again.
REVIEW: 127714

M  +25   -24   thumbnail/CMakeLists.txt
M  +0    -2    thumbnail/windowsexecreator.cpp
M  +0    -2    thumbnail/windowsimagecreator.cpp

http://commits.kde.org/kio-extras/fe9116847d6f2e36c1ec04e2af0cfac2553336fd

diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt
index 6a6ecc7..2600bfe 100644
--- a/thumbnail/CMakeLists.txt
+++ b/thumbnail/CMakeLists.txt
@@ -188,30 +188,31 @@ endif()
 # =

 # endif()
 # =

-# ########### next target ###############
-# =

-#set ( windowsexethumbnail_SRCS windowsexecreator.cpp icoutils_common.cpp)
-#set ( windowsimagethumbnail_SRCS windowsimagecreator.cpp icoutils_common.=
cpp)
-#
-#if(WIN32)
-#    set ( windowsexethumbnail_SRCS ${windowsexethumbnail_SRCS} icoutils_w=
in.cpp )
-#    set ( windowsimagethumbnail_SRCS ${windowsimagethumbnail_SRCS} icouti=
ls_win.cpp )
-#else()
-#    set ( windowsexethumbnail_SRCS ${windowsexethumbnail_SRCS} icoutils_w=
restool.cpp )
-#    set ( windowsimagethumbnail_SRCS ${windowsimagethumbnail_SRCS} icouti=
ls_wrestool.cpp )
-#endif()
-
-# add_library(windowsexethumbnail MODULE ${windowsexethumbnail_SRCS} )
-# target_link_libraries ( windowsexethumbnail ${KIO_LIBRARIES} )
-# install ( TARGETS windowsexethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
-# install ( FILES windowsexethumbnail.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR} )
-# =

-# add_library(windowsimagethumbnail MODULE ${windowsimagethumbnail_SRCS} )
-# target_link_libraries ( windowsimagethumbnail ${KIO_LIBRARIES} )
-# install ( TARGETS windowsimagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR=
} )
-# install ( FILES windowsimagethumbnail.desktop DESTINATION ${SERVICES_INS=
TALL_DIR} )
-# =

-# ########### next target ###############
+
+########### next target ###############
+
+set ( windowsexethumbnail_SRCS windowsexecreator.cpp icoutils_common.cpp)
+set ( windowsimagethumbnail_SRCS windowsimagecreator.cpp icoutils_common.c=
pp)
+
+if(WIN32)
+    set ( windowsexethumbnail_SRCS ${windowsexethumbnail_SRCS} icoutils_wi=
n.cpp )
+    set ( windowsimagethumbnail_SRCS ${windowsimagethumbnail_SRCS} icoutil=
s_win.cpp )
+else()
+    set ( windowsexethumbnail_SRCS ${windowsexethumbnail_SRCS} icoutils_wr=
estool.cpp )
+    set ( windowsimagethumbnail_SRCS ${windowsimagethumbnail_SRCS} icoutil=
s_wrestool.cpp )
+endif()
+
+add_library(windowsexethumbnail MODULE ${windowsexethumbnail_SRCS} )
+target_link_libraries ( windowsexethumbnail KF5::KIOWidgets )
+install ( TARGETS windowsexethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+install ( FILES windowsexethumbnail.desktop DESTINATION ${SERVICES_INSTALL=
_DIR} )
+
+add_library(windowsimagethumbnail MODULE ${windowsimagethumbnail_SRCS} )
+target_link_libraries ( windowsimagethumbnail KF5::KIOWidgets )
+install ( TARGETS windowsimagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+install ( FILES windowsimagethumbnail.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR} )
+
+########### next target ###############
 =

 set(comicbookthumbnail_SRCS comiccreator.cpp)
 add_library(comicbookthumbnail MODULE ${comicbookthumbnail_SRCS})
diff --git a/thumbnail/windowsexecreator.cpp b/thumbnail/windowsexecreator.=
cpp
index f823597..4ced88f 100644
--- a/thumbnail/windowsexecreator.cpp
+++ b/thumbnail/windowsexecreator.cpp
@@ -19,8 +19,6 @@
 #include <QString>
 #include <QImage>
 =

-#include <kdemacros.h>
-
 extern "C"
 {
     Q_DECL_EXPORT ThumbCreator *new_creator()
diff --git a/thumbnail/windowsimagecreator.cpp b/thumbnail/windowsimagecrea=
tor.cpp
index cb110f3..109b9af 100644
--- a/thumbnail/windowsimagecreator.cpp
+++ b/thumbnail/windowsimagecreator.cpp
@@ -19,8 +19,6 @@
 #include <QString>
 #include <QImage>
 =

-#include <kdemacros.h>
-
 extern "C"
 {
     Q_DECL_EXPORT ThumbCreator *new_creator()
[prev in list] [next in list] [prev in thread] [next in thread]