Git commit 49ce3fc4d2524df72d9cffa0cdeae687af606804 by Montel Laurent. Committed on 03/08/2015 at 07:44. Pushed by mlaurent into branch 'frameworks'.
Merge remote-tracking branch 'origin/master' into frameworks Conflicts: core/version.h M +2 -0 CMakeLists.txt M +2 -2 conf/dlgperformance.cpp M +5 -0 conf/dlgpresentationbase.ui M +1 -0 conf/okular.kcfg M +43 -41 core/document.cpp M +1 -1 core/script/kjs_document.cpp M +7 -4 doc/index.docbook M +1 -0 generators/djvu/active-documentviewer_djvu.desktop M +1 -0 generators/djvu/okularApplication_djvu.desktop M +1 -0 generators/dvi/active-documentviewer_dvi.desktop M +1 -0 generators/dvi/okularApplication_dvi.desktop M +1 -0 generators/poppler/annots.cpp M +1 -1 interfaces/viewerinterface.h M +3 -1 kdocumentviewer.h M +2 -2 part.cpp M +6 -0 ui/magnifierview.cpp M +1 -1 ui/pagepainter.cpp M +3 -2 ui/pageview.cpp M +69 -12 ui/presentationwidget.cpp http://commits.kde.org/okular/49ce3fc4d2524df72d9cffa0cdeae687af606804 diff --cc CMakeLists.txt index aafe267,27a88dd..2e8e4d6 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -1,55 -1,10 +1,56 @@@ + cmake_minimum_required(VERSION 2.8.9) project(okular) -find_package(KDE4 4.6.0 REQUIRED) -include(KDE4Defaults) -include(MacroLibrary) -include(MacroOptionalAddSubdirectory) +cmake_minimum_required(VERSION 2.8.12) + +set(QT_REQUIRED_VERSION "5.2.0") +set(KF5_REQUIRED_VERSION "5.8.0") + +find_package(ECM 1.7.0 CONFIG REQUIRED) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + +include(ECMInstallIcons) +include(ECMSetupVersion) +include(ECMOptionalAddSubdirectory) +include(GenerateExportHeader) +include(FeatureSummary) +include(ECMAddAppIcon) +include(KDEFrameworkCompilerSettings) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(ECMAddTests) +include(ECMAddAppIcon) +include(ECMPackageConfigHelpers) + +ecm_setup_version(1.0.0 VARIABLE_PREFIX OKULAR + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake") + +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick) +find_package(Qt5 ${QT_REQUIRED_VERSION} OPTIONAL_COMPONENTS TextToSpeech) +if (NOT Qt5TextToSpeech_FOUND) + message(STATUS "Qt5TextToSpeech not found, speech features will be disabled") +else() + add_definitions(-DHAVE_SPEECH) +endif() + +find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS + Activities + Archive + Bookmarks + Config + ConfigWidgets + CoreAddons + DBusAddons + JS + KDELibs4Support + KIO + Parts + ThreadWeaver + Wallet + KHtml +) +find_package(Phonon4Qt5 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules) diff --cc interfaces/viewerinterface.h index 7245497,1418c60..4f27921 --- a/interfaces/viewerinterface.h +++ b/interfaces/viewerinterface.h @@@ -23,7 -23,7 +23,7 @@@ namespace Okular * This interface can be used to control some more or less advanced features of a document * viewer. */ - class ViewerInterface -class OKULAR_EXPORT ViewerInterface ++class OKULARCORE_EXPORT ViewerInterface { public: virtual ~ViewerInterface() {} diff --cc kdocumentviewer.h index dc23cbf,f99c69e..d121887 --- a/kdocumentviewer.h +++ b/kdocumentviewer.h @@@ -10,16 -10,18 +10,18 @@@ #ifndef _KDOCUMENTVIEWER_H_ #define _KDOCUMENTVIEWER_H_ -#include "okular_part_export.h" ++#include "okularpart_export.h" + #include <QtCore/QStringList> -class KUrl; +class QUrl; /** * @short Abstract interface for a document viewer * - * This interface describe briefly the basic functions of a document viewer. + * This interface describes the basic functions of a document viewer. */ - class KDocumentViewer -class OKULAR_PART_EXPORT KDocumentViewer ++class OKULARPART_EXPORT KDocumentViewer { public: virtual ~KDocumentViewer() {} diff --cc ui/pagepainter.cpp index cad7fde,6eed5b6..7c834e1 --- a/ui/pagepainter.cpp +++ b/ui/pagepainter.cpp @@@ -101,12 -101,12 +101,12 @@@ void PagePainter::paintCroppedPageOnPai double pixmapRescaleRatio = pixmap ? scaledWidth / (double)pixmap->width() : -1; long pixmapPixels = pixmap ? (long)pixmap->width() * (long)pixmap->height() : 0; if ( !pixmap || pixmapRescaleRatio > 20.0 || pixmapRescaleRatio < 0.25 || - (scaledWidth != pixmap->width() && pixmapPixels > 6000000L) ) + (scaledWidth > pixmap->width() && pixmapPixels > 60000000L) ) { // draw something on the blank page: the okular icon or a cross (as a fallback) - if ( !busyPixmap->isNull() ) + if ( !busyPixmap()->isNull() ) { - destPainter->drawPixmap( QPoint( 10, 10 ), *busyPixmap ); + destPainter->drawPixmap( QPoint( 10, 10 ), *busyPixmap() ); } else { _______________________________________________ kde-doc-english mailing list kde-doc-english@kde.org https://mail.kde.org/mailman/listinfo/kde-doc-english