diff --git a/CMakeLists.txt b/CMakeLists.txt index ebdd4c8bd..d76f67e0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,7 @@ find_package(ZLIB REQUIRED) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_definitions(-DTRANSLATION_DOMAIN="okular") +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core) diff --git a/generators/chm/generator_chm.cpp b/generators/chm/generator_chm.cpp index 4913f46f3..ada9b3d53 100644 --- a/generators/chm/generator_chm.cpp +++ b/generators/chm/generator_chm.cpp @@ -102,8 +102,8 @@ bool CHMGenerator::loadDocument( const QString & fileName, QVector< Okular::Page // fill m_urlPage and m_pageUrl QList pageList; m_file->enumerateFiles(pageList); - const QString home = m_file->homeUrl().toString(); - if (home != QLatin1String("/")) + const QUrl home = m_file->homeUrl(); + if (home.path() != QLatin1String("/")) pageList.prepend(home); m_pageUrl.resize(pageNum);