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

Fix build with Qt 5.5

Browse Source 
Also enable plugins: FlashCookieManager, Gnome and KWallet passwords.
This commit is contained in:
David Rosca 2015-05-22 18:14:16 +02:00
parent deb7251231
commit 05fcc35658
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QupZilla.pro
View File

@ -24,4 +24,4 @@ src_main.depends = sub-src-lib
src_plugins.subdir = src/plugins src_plugins.subdir = src/plugins
src_plugins.depends = sub-src-lib src_plugins.depends = sub-src-lib
SUBDIRS += src_lib src_main SUBDIRS += src_lib src_main src_plugins

1
src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp vendored
View File

@ -48,6 +48,7 @@
#include "qtlocalpeer.h" #include "qtlocalpeer.h"
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QTime> #include <QtCore/QTime>
#include <QtCore/QDataStream>
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#include <QtCore/QLibrary> #include <QtCore/QLibrary>

6
src/plugins.pri
View File

@ -33,11 +33,7 @@ TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
DESTDIR = $$QZ_DESTDIR/plugins/ DESTDIR = $$QZ_DESTDIR/plugins/
isEqual(QT_MAJOR_VERSION, 5) { QT *= webenginewidgets network
QT *= webkitwidgets network
} else {
QT *= webkit network
}
OBJECTS_DIR = build OBJECTS_DIR = build
MOC_DIR = build MOC_DIR = build

1
src/plugins/TabManager/tabmanagerplugin.h
View File

@ -25,7 +25,6 @@
#include <QDebug> #include <QDebug>
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <QWebElement>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPointer> #include <QPointer>

1
src/plugins/TestPlugin/testplugin.h
View File

@ -28,7 +28,6 @@
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <QWebElement>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPointer> #include <QPointer>

17
src/plugins/plugins.pro
View File

@ -26,8 +26,8 @@ defineTest(disablePlugin) {
addSubdir($$PWD) addSubdir($$PWD)
outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR) #outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
!equals(outOfDirPlugins, ""): addSubdir($$(QUPZILLA_PLUGINS_SRCDIR)) #!equals(outOfDirPlugins, ""): addSubdir($$(QUPZILLA_PLUGINS_SRCDIR))
# TestPlugin only in debug build # TestPlugin only in debug build
!CONFIG(debug, debug|release): disablePlugin(TestPlugin) !CONFIG(debug, debug|release): disablePlugin(TestPlugin)
@ -39,3 +39,16 @@ isEqual(QT_MAJOR_VERSION, 5): !qtHaveModule(KWallet): disablePlugin(KWalletPassw
# GnomeKeyringPasswords only with GNOME_INTEGRATION and gnome-keyring pkg-config # GnomeKeyringPasswords only with GNOME_INTEGRATION and gnome-keyring pkg-config
!contains(DEFINES, GNOME_INTEGRATION): disablePlugin(GnomeKeyringPasswords) !contains(DEFINES, GNOME_INTEGRATION): disablePlugin(GnomeKeyringPasswords)
!system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords) !system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords)
# QtWebEngine disable
disablePlugin(AccessKeysNavigation)
disablePlugin(AutoScroll)
disablePlugin(CopyTitle)
disablePlugin(GreaseMonkey)
disablePlugin(MailHandle)
disablePlugin(MouseGestures)
disablePlugin(PIM)
disablePlugin(StatusBarIcons)
disablePlugin(TabManager)
disablePlugin(TestPlugin)
disablePlugin(Videoner)