summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukáš Tinkl <lukas@kde.org>2015-01-29 20:52:31 (GMT)
committerLukáš Tinkl <lukas@kde.org>2015-01-29 20:52:31 (GMT)
commitdc06e7265721b1ca6f91be4ee42ce17b74ec8da3 (patch)
tree4bc85c46a4098d7ac2dd128aa0e4d691dae05456
parente9ae1d99afc16d62faa27a2b5dbcdb4eed58548e (diff)
fix build and an unintended KScreen change
-rw-r--r--CMakeLists.txt4
-rw-r--r--ui/annotationwidgets.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9bb450..b9bc1f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
diff --git a/ui/annotationwidgets.cpp b/ui/annotationwidgets.cpp
index 6b30845..ba49a2b 100644
--- a/ui/annotationwidgets.cpp
+++ b/ui/annotationwidgets.cpp
@@ -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 );