Skip to content

Commit e638293

Browse files
Improved cross compilation compatibility
1 parent 7aa2a8e commit e638293

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/application/core/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ find_package(Poppler "0.86.0" COMPONENTS Qt5)
129129
set_okular_optional_package_properties(Poppler PROPERTIES
130130
PURPOSE "Support for PDF files in okular.")
131131

132-
133132
find_package(Freetype)
134133
set_okular_optional_package_properties(Freetype PROPERTIES
135134
DESCRIPTION "A font rendering engine"
@@ -549,4 +548,4 @@ install(EXPORT Okular5Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE Okul
549548

550549
install(FILES
551550
core/stamps.svg
552-
DESTINATION ${KDE_INSTALL_DATADIR}/okular/pics)
551+
DESTINATION ${KDE_INSTALL_DATADIR}/okular/pics)

src/application/core/generators/dvi/generator_dvi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ Okular::FontInfo::List DviGenerator::fontsForPage(int page)
439439
QString::number(zoom));
440440
}
441441
#else
442-
name = QString("%1, %2%").arg(font->fontname).arg(zoom);
442+
name = QString::fromLatin1("%1, %2%").arg(font->fontname).arg(zoom);
443443
#endif
444444
of.setName(name);
445445

src/main.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "sidebar_state.hpp"
3030
#include "tag_dto.hpp"
3131
#include "user_controller.hpp"
32-
#include "user_dto.hpp"
3332

3433

3534
using namespace adapters::controllers;
@@ -49,6 +48,7 @@ int main(int argc, char* argv[])
4948
QGuiApplication::setOrganizationDomain("Etovex.com");
5049
QGuiApplication::setApplicationName("Librum");
5150
QQuickStyle::setStyle(QStringLiteral("Default"));
51+
app.addLibraryPath("/usr/local/lib/plugins");
5252

5353
qInstallMessageHandler(logging::messageHandler);
5454

@@ -67,7 +67,6 @@ int main(int argc, char* argv[])
6767
qmlRegisterType<cpp_elements::DocumentItem>("Librum.elements", 1, 0, "DocumentItem");
6868
qRegisterMetaType<adapters::dtos::BookDto>();
6969
qRegisterMetaType<adapters::dtos::TagDto>();
70-
qRegisterMetaType<adapters::dtos::UserDto>();
7170

7271

7372
// Authentication-Stack
@@ -205,4 +204,4 @@ void loadFonts()
205204

206205
QFont defaultFont("SF Pro Display");
207206
QGuiApplication::setFont(defaultFont);
208-
}
207+
}

0 commit comments

Comments
 (0)