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

List:       kde-commits
Subject:    =?utf-8?q?=5Bgwenview=5D_/=3A_Merge_branch_=27agateau/restore=27?=
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2011-05-09 21:38:40
Message-ID: 20110509213840.76635A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit c2bad8fd65c1286c823178a9081ce67c880559a8 by Aurélien Gâteau.
Committed on 09/05/2011 at 23:36.
Pushed by gateau into branch 'master'.

Merge branch 'agateau/restore'

Conflicts:
	CMakeLists.txt

MM +3    -0    CMakeLists.txt     
I  +2    -0    app/CMakeLists.txt     
I  +12   -0    app/fileopscontextmanageritem.cpp     
I  +1    -0    app/fileopscontextmanageritem.h     
I  +21   -14   app/thumbnailviewhelper.cpp     

http://commits.kde.org/gwenview/c2bad8fd65c1286c823178a9081ce67c880559a8

diff --cc CMakeLists.txt
index a03fe8a,d27b26b..663c6da
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,42 -42,13 +25,45 @@@ else (GWENVIEW_SEMANTICINFO_BACKEND STR
  	endif (GWENVIEW_SEMANTICINFO_BACKEND STREQUAL "Fake")
  endif (GWENVIEW_SEMANTICINFO_BACKEND STREQUAL "None")
  
 +## Dependencies
 +find_package(JPEG)
 +macro_log_feature(JPEG_FOUND "libjpeg" "Provides JPEG image manipulation support" \
"http://libjpeg.sourceforge.net/" TRUE "" "")  +
 +set(EXIV2_MIN_VERSION "0.19")
 +find_package(Exiv2)
 +macro_log_feature(EXIV2_FOUND "Exiv2" "Provides image metadata support" \
"http://www.exiv2.org" TRUE ${EXIV2_MIN_VERSION} "")  +
 +macro_optional_find_package(Kipi)
 +macro_log_feature(KIPI_FOUND "KIPI Plugins" "Provides various image manipulation \
and export features" "http://www.kipi-plugins.org" FALSE "" "")  +
  if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
 -	# We need Nepomuk widgets in all cases
 -	find_package(Nepomuk REQUIRED)
 +	# We need Nepomuk widgets for all backends but "None"
 +	find_package(Nepomuk)
 +	macro_log_feature(Nepomuk_FOUND "Nepomuk" "Provides desktop-wide semantic \
information support" "http://www.kde.org" TRUE "" "")  endif (NOT \
GWENVIEW_SEMANTICINFO_BACKEND_NONE)  
++find_package(LibKonq)
++macro_log_feature(LIBKONQ_FOUND "libkonq" "Provides file management features" \
"http://www.kde.org" TRUE "" "") ++
 +## Global settings
 +
 +# Avoid some build-time warnings in Nepomuk
  add_definitions(-DDISABLE_NEPOMUK_LEGACY)
  
 +add_definitions(
 +	${QT_DEFINITIONS}
 +	${QT_QTDBUS_DEFINITIONS}
 +	${KDE4_DEFINITIONS}
 +	)
 +
 +include_directories(
 +	${QDBUS_INCLUDE_DIRS}
 +	${CMAKE_SOURCE_DIR}
 +	${CMAKE_BINARY_DIR}
 +	${KDE4_INCLUDES}
 +	)
 +
 +## dirs to build
  add_subdirectory(lib)
  add_subdirectory(app)
  add_subdirectory(importer)


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