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.0'

Browse Source
This commit is contained in:
David Rosca 2018-05-26 20:13:17 +02:00
commit 0f1c46d0e7
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -98,7 +98,7 @@ find_package(PkgConfig)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
option(BUILD_KEYRING "Gnome keyring password plugin" ON) option(BUILD_KEYRING "Gnome keyring password plugin" ON)
if (BUILD_KEYRING) if (BUILD_KEYRING)
pkg_check_modules(GNOME_KEYRING gnome-keyring-1) pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 )
endif() endif()
endif() endif()

2
src/lib/adblock/adblockmanager.cpp
View File

@ -359,7 +359,9 @@ void AdBlockManager::updateMatcher()
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
mApp->networkManager()->removeUrlInterceptor(m_interceptor);
m_matcher->update(); m_matcher->update();
mApp->networkManager()->installUrlInterceptor(m_interceptor);
} }
void AdBlockManager::updateAllSubscriptions() void AdBlockManager::updateAllSubscriptions()

1
src/lib/webengine/webview.cpp
View File

@ -35,6 +35,7 @@
#include "scripts.h" #include "scripts.h"
#include "webhittestresult.h" #include "webhittestresult.h"
#include "webscrollbarmanager.h" #include "webscrollbarmanager.h"
#include "../config.h"
#include <iostream> #include <iostream>

2
src/plugins/GnomeKeyringPasswords/CMakeLists.txt
View File

@ -14,5 +14,5 @@ qt5_add_resources(RSCS ${GnomeKeyringPasswords_RSCS})
add_library(GnomeKeyringPasswords MODULE ${GnomeKeyringPasswords_SRCS} ${RSCS}) add_library(GnomeKeyringPasswords MODULE ${GnomeKeyringPasswords_SRCS} ${RSCS})
install(TARGETS GnomeKeyringPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR}) install(TARGETS GnomeKeyringPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR})
target_link_libraries(GnomeKeyringPasswords ${GNOME_KEYRING_LIBRARIES} FalkonPrivate) target_link_libraries(GnomeKeyringPasswords PkgConfig::GNOME_KEYRING FalkonPrivate)