Commit ee2418be authored by David Faure's avatar David Faure

Re-enable -DQT_NO_URL_CAST_FROM_STRING and fix the CHM backend.

parent 80b1b67a
......@@ -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)
......
......@@ -102,8 +102,8 @@ bool CHMGenerator::loadDocument( const QString & fileName, QVector< Okular::Page
// fill m_urlPage and m_pageUrl
QList<QUrl> 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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment