diff options
Diffstat (limited to 'tdefile-plugins')
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | tdefile-plugins/ps/gscreator.cpp | 2 | ||||
| -rw-r--r-- | tdefile-plugins/raw/kcamerarawplugin.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 99a48c8e..41cef754 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -14,6 +14,8 @@ set( POPPLER_VERSION_PATCH ${CMAKE_MATCH_3} ) math( EXPR POPPLER_VERSION_C "(${POPPLER_VERSION_MAJOR}*1000000) + (${POPPLER_VERSION_MINOR}*1000) + ${POPPLER_VERSION_PATCH}" ) set( POPPLER_VERSION_C ${POPPLER_VERSION_C} CACHE INTERNAL "Poppler library version as code number" ) -if( NOT POPPLER_VERSION_C LESS 21012000 ) +if( NOT POPPLER_VERSION_C LESS 24004000 ) + set( POPPLER_CXX_FEATURES cxx_std_20 CACHE INTERNAL "C++ standard required by Poppler" ) +elseif( NOT POPPLER_VERSION_C LESS 21012000 ) set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" ) endif() diff --git a/tdefile-plugins/ps/gscreator.cpp b/tdefile-plugins/ps/gscreator.cpp index 88601a4c..e654efeb 100644 --- a/tdefile-plugins/ps/gscreator.cpp +++ b/tdefile-plugins/ps/gscreator.cpp @@ -81,7 +81,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new GSCreator; } diff --git a/tdefile-plugins/raw/kcamerarawplugin.cpp b/tdefile-plugins/raw/kcamerarawplugin.cpp index 6ac4759c..dd367f65 100644 --- a/tdefile-plugins/raw/kcamerarawplugin.cpp +++ b/tdefile-plugins/raw/kcamerarawplugin.cpp @@ -38,8 +38,8 @@ typedef KGenericFactory<KCameraRawPlugin> RawFactory; K_EXPORT_COMPONENT_FACTORY(tdefile_raw, RawFactory("tdefile_raw")) -#ifndef KDE_EXPORT -# define KDE_EXPORT +#ifndef TDE_EXPORT +# define TDE_EXPORT #endif /* Main entry point into raw parser */ |