mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-05 23:49:20 +00:00
Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"
This commit is contained in:
parent
89e7b03a3b
commit
71cc9b131c
|
@ -11,6 +11,7 @@ macro_optional_find_package(QImageBlitz)
|
||||||
macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "An image effects library" "http://sourceforge.net/projects/qimageblitz" TRUE "kdesupport" "Required to build Okular.")
|
macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "An image effects library" "http://sourceforge.net/projects/qimageblitz" TRUE "kdesupport" "Required to build Okular.")
|
||||||
|
|
||||||
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
|
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
|
||||||
|
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
|
||||||
include_directories(
|
include_directories(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${KDE4_INCLUDES}
|
${KDE4_INCLUDES}
|
||||||
|
|
|
@ -181,7 +181,7 @@ bool CHMGenerator::doCloseDocument()
|
||||||
|
|
||||||
void CHMGenerator::preparePageForSyncOperation( int zoom , const QString & url)
|
void CHMGenerator::preparePageForSyncOperation( int zoom , const QString & url)
|
||||||
{
|
{
|
||||||
KUrl pAddress= "ms-its:" + m_fileName + "::" + url;
|
KUrl pAddress= QString("ms-its:" + m_fileName + "::" + url);
|
||||||
m_chmUrl = url;
|
m_chmUrl = url;
|
||||||
m_syncGen->setZoomFactor(zoom);
|
m_syncGen->setZoomFactor(zoom);
|
||||||
m_syncGen->openUrl(pAddress);
|
m_syncGen->openUrl(pAddress);
|
||||||
|
@ -278,7 +278,7 @@ void CHMGenerator::generatePixmap( Okular::PixmapRequest * request )
|
||||||
, static_cast<double>(requestHeight)/static_cast<double>(request->page()->height())
|
, static_cast<double>(requestHeight)/static_cast<double>(request->page()->height())
|
||||||
) ) * 100;
|
) ) * 100;
|
||||||
|
|
||||||
KUrl pAddress= "ms-its:" + m_fileName + "::" + url;
|
KUrl pAddress= QString("ms-its:" + m_fileName + "::" + url);
|
||||||
m_chmUrl = url;
|
m_chmUrl = url;
|
||||||
m_syncGen->setZoomFactor(zoom);
|
m_syncGen->setZoomFactor(zoom);
|
||||||
m_syncGen->view()->resize(requestWidth,requestHeight);
|
m_syncGen->view()->resize(requestWidth,requestHeight);
|
||||||
|
|
|
@ -205,7 +205,7 @@ bool find_exe(const QString& exe_)
|
||||||
const iterator end = path.end();
|
const iterator end = path.end();
|
||||||
for (iterator it = path.begin(); it != end; ++it) {
|
for (iterator it = path.begin(); it != end; ++it) {
|
||||||
const QString dir = it->endsWith("/") ? *it : *it + '/';
|
const QString dir = it->endsWith("/") ? *it : *it + '/';
|
||||||
const QFileInfo abs_exe = dir + exe.filePath();
|
const QFileInfo abs_exe = QString(dir + exe.filePath());
|
||||||
|
|
||||||
if (abs_exe.exists())
|
if (abs_exe.exists())
|
||||||
return abs_exe.isReadable() && abs_exe.isExecutable();
|
return abs_exe.isReadable() && abs_exe.isExecutable();
|
||||||
|
|
Loading…
Reference in a new issue