office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-05 23:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build and an unintended KScreen change

Browse source
This commit is contained in:
Lukáš Tinkl 2015-01-29 21:52:31 +01:00
parent e9ae1d99af
commit dc06e72657
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -61,7 +61,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR})
message("TODO: when core compiles add subdirs")
add_subdirectory( active )
add_subdirectory( ui )
add_subdirectory( shell )
@ -192,7 +191,8 @@ target_link_libraries(okularcore
)
if(LibKScreen_FOUND)
target_link_libraries(okularcore KF5::LibKScreen)
message("KF5: port code to KScreen")
#target_link_libraries(okularcore KF5::LibKScreen)
endif(LibKScreen_FOUND)
set_target_properties(okularcore PROPERTIES VERSION 6.0.0 SOVERSION 6 )

2
ui/annotationwidgets.cpp
View file

@ -660,7 +660,7 @@ QWidget * FileAttachmentAnnotationWidget::createExtraWidget()
Okular::EmbeddedFile *ef = m_attachAnn->embeddedFile();
const int size = ef->size();
const QString sizeString = size <= 0 ? i18nc( "Not available size", "N/A" ) : KFormat::formatByteSize( size );
const QString sizeString = size <= 0 ? i18nc( "Not available size", "N/A" ) : KFormat().formatByteSize( size );
const QString descString = ef->description().isEmpty() ? i18n( "No description available." ) : ef->description();
QGridLayout * lay = new QGridLayout( widget );