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

List:       kde-commits
Subject:    KDE/kdelibs/kio
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 8:44:09
Message-ID: 20101104084409.0E9BAAC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192896 by ervin:

Remove deprecated classes from the build when KDE_NO_DEPRECATED is
activated.


 M  +25 -8     CMakeLists.txt  


--- trunk/KDE/kdelibs/kio/CMakeLists.txt #1192895:1192896
@@ -92,7 +92,6 @@
   kio/kfilewriteplugin.cpp
   kio/kimageio.cpp
   kio/kmimetypechooser.cpp
-  kio/kmimetyperesolver.cpp
   kio/kprotocolmanager.cpp
   kio/kremoteencoding.cpp
   kio/krun.cpp
@@ -103,7 +102,6 @@
   kio/kurlpixmapprovider.cpp
   kio/metainfojob.cpp
   kio/netaccess.cpp
-  kio/passworddialog.cpp
   kio/paste.cpp
   kio/pastedialog.cpp
   kio/predicateproperties.cpp
@@ -126,6 +124,14 @@
   kio/kpasswdserverloop.cpp
 )
 
+if(NOT KDE_NO_DEPRECATED)
+  set(kiocore_STAT_SRCS
+    ${kiocore_STAT_SRCS}
+    kio/kmimetyperesolver.cpp
+    kio/passworddialog.cpp
+    )
+endif(NOT KDE_NO_DEPRECATED)
+
 if(NOT KIO_NO_SOLID)
   set(kiocore_STAT_SRCS
     ${kiocore_STAT_SRCS}
@@ -164,7 +170,6 @@
   bookmarks/kbookmarkmanageradaptor.cc
   bookmarks/kbookmarkmenu.cc
   bookmarks/konqbookmarkmenu.cc
-  bookmarks/kbookmarkimporter_crash.cc
   bookmarks/kbookmarkimporter_opera.cc
   bookmarks/kbookmarkimporter_ie.cc
   bookmarks/kbookmarkimporter_ns.cc
@@ -172,10 +177,16 @@
   bookmarks/kbookmarkdialog.cc
 )
 
+if(NOT KDE_NO_DEPRECATED)
+  set(kbookmarks_STAT_SRCS
+    ${kbookmarks_STAT_SRCS}
+    bookmarks/kbookmarkimporter_crash.cc
+    )
+endif(NOT KDE_NO_DEPRECATED)
+
 set(kfile_STAT_SRCS
   kfile/kabstractfilemodule.cpp
   kfile/kacleditwidget.cpp
-  kfile/kdiskfreespace.cpp
   kfile/kdiskfreespaceinfo.cpp
   kfile/kencodingfiledialog.cpp
   kfile/kfile.cpp
@@ -203,6 +214,7 @@
 if(NOT KIO_NO_SOLID)
   set(kfile_STAT_SRCS
     ${kfile_STAT_SRCS}
+    kfile/kdiskfreespace.cpp
     kfile/kdevicelistitem.cpp
     kfile/kdevicelistmodel.cpp
     )
@@ -328,7 +340,6 @@
   kio/slaveconfig.h
   kio/sessiondata.h
   kio/global.h
-  kio/passworddialog.h
   kio/netaccess.h
   kio/job.h
   kio/scheduler.h
@@ -387,7 +398,6 @@
   kio/kfilewriteplugin.h
   kio/kimageio.h
   kio/kmimetypechooser.h
-  kio/kmimetyperesolver.h
   kio/knfsshare.h
   kio/kprotocolmanager.h
   kio/kremoteencoding.h
@@ -401,7 +411,6 @@
   kio/predicateproperties.h
   kfile/kabstractfilemodule.h
   kfile/kabstractfilewidget.h
-  kfile/kdiskfreespace.h
   kfile/kdiskfreespaceinfo.h
   kfile/kencodingfiledialog.h
   kfile/kfile.h
@@ -423,7 +432,6 @@
   bookmarks/kbookmarkimporter.h
   bookmarks/kbookmarkmanager.h
   bookmarks/kbookmarkmenu.h
-  bookmarks/kbookmarkimporter_crash.h
   bookmarks/kbookmarkimporter_opera.h
   bookmarks/kbookmarkimporter_ie.h
   bookmarks/kbookmarkimporter_ns.h
@@ -432,6 +440,15 @@
   bookmarks/kbookmarkdialog.h
   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
 
+if(NOT KDE_NO_DEPRECATED)
+install( FILES
+  bookmarks/kbookmarkimporter_crash.h
+  kfile/kdiskfreespace.h
+  kio/kmimetyperesolver.h
+  kio/passworddialog.h
+  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
+endif(NOT KDE_NO_DEPRECATED)
+
 if(NOT KIO_NO_SOLID)
 install( FILES
   kfile/kdevicelistmodel.h
[prev in list] [next in list] [prev in thread] [next in thread]