Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Merge branch 'Falkon/3.1'

Browse Source
This commit is contained in:
David Rosca 2019-03-20 11:31:03 +01:00
commit f835f0ecac
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindLibIntl.cmake
View File

@ -1,9 +0,0 @@
find_path(LibIntl_INCLUDE_DIRS NAMES libintl.h)
find_library(LibIntl_LIBRARIES NAMES intl libintl)
include(CheckCXXSymbolExists)
check_cxx_symbol_exists(gettext libintl.h LibIntl_SYMBOL_FOUND)
if (LibIntl_SYMBOL_FOUND)
set(HAVE_LIBINTL TRUE)
else()
set(HAVE_LIBINTL FALSE)
endif()

8
src/lib/tools/scripts.cpp
View File

@ -146,13 +146,13 @@ QString Scripts::setupWindowObject()
" console.warn('NOT IMPLEMENTED: IsSearchProviderInstalled()');" " console.warn('NOT IMPLEMENTED: IsSearchProviderInstalled()');"
" return false;" " return false;"
"};" "};"
"window.external = external;" "window.external = external;");
#if QTWEBENGINEWIDGETS_VERSION < QT_VERSION_CHECK(5, 12, 0) #if QTWEBENGINEWIDGETS_VERSION < QT_VERSION_CHECK(5, 12, 0)
"window.print = function() {" source += QL1S("window.print = function() {"
" window.location = 'falkon:PrintPage';" " window.location = 'falkon:PrintPage';"
"};" "};");
#endif #endif
"})()"); source += QL1S("})()");
return source; return source;
} }