Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Don't link to unused Qt modules

Browse Source
This commit is contained in:
David Rosca 2015-08-29 18:32:57 +02:00
parent ef71be2a0e
commit 495ebc785e
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/app/browserwindow.cpp
View File

@ -80,8 +80,6 @@
#include <QFileDialog> #include <QFileDialog>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QDesktopServices> #include <QDesktopServices>
#include <QPrintPreviewDialog>
#include <QPrinter>
#include <QWebEngineHistory> #include <QWebEngineHistory>
#include <QWebEngineSettings> #include <QWebEngineSettings>
#include <QMessageBox> #include <QMessageBox>
@ -1193,6 +1191,7 @@ bool BrowserWindow::event(QEvent* event)
void BrowserWindow::printPage(QWebEngineFrame* frame) void BrowserWindow::printPage(QWebEngineFrame* frame)
{ {
#if QTWEBENGINE_DISABLED
QPrintPreviewDialog* dialog = new QPrintPreviewDialog(this); QPrintPreviewDialog* dialog = new QPrintPreviewDialog(this);
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->resize(800, 750); dialog->resize(800, 750);
@ -1204,14 +1203,13 @@ void BrowserWindow::printPage(QWebEngineFrame* frame)
connect(dialog, SIGNAL(paintRequested(QPrinter*)), weView(), SLOT(print(QPrinter*))); connect(dialog, SIGNAL(paintRequested(QPrinter*)), weView(), SLOT(print(QPrinter*)));
} }
else { else {
#if QTWEBENGINE_DISABLED
dialog->printer()->setDocName(QzTools::getFileNameFromUrl(QzTools::frameUrl(frame))); dialog->printer()->setDocName(QzTools::getFileNameFromUrl(QzTools::frameUrl(frame)));
connect(dialog, SIGNAL(paintRequested(QPrinter*)), frame, SLOT(print(QPrinter*))); connect(dialog, SIGNAL(paintRequested(QPrinter*)), frame, SLOT(print(QPrinter*)));
#endif
} }
dialog->open(); dialog->open();
#endif
} }
void BrowserWindow::savePageScreen() void BrowserWindow::savePageScreen()

2
src/lib/lib.pro
View File

@ -1,4 +1,4 @@
QT += webenginewidgets webenginewidgets-private webchannel network widgets printsupport sql script gui-private QT += webenginewidgets webenginewidgets-private webchannel network widgets sql script
TARGET = QupZilla TARGET = QupZilla
TEMPLATE = lib TEMPLATE = lib

12
src/lib/tools/qztools.cpp
View File

@ -42,11 +42,9 @@
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QUrlQuery> #include <QUrlQuery>
#include <qpa/qplatformnativeinterface.h>
#else
#include <QX11Info>
#endif #endif
#ifdef QZ_WS_X11 #ifdef QZ_WS_X11
#include <QX11Info>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#endif #endif
@ -829,14 +827,10 @@ void* QzTools::X11Display(const QWidget* widget)
Q_UNUSED(widget) Q_UNUSED(widget)
#ifdef QZ_WS_X11 #ifdef QZ_WS_X11
#if QT_VERSION >= 0x050000
return qApp->platformNativeInterface()->nativeResourceForWindow("display", widget->windowHandle());
#else
return QX11Info::display(); return QX11Info::display();
#endif #else
#endif
return 0; return 0;
#endif
} }
void QzTools::setWmClass(const QString &name, const QWidget* widget) void QzTools::setWmClass(const QString &name, const QWidget* widget)

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

@ -50,7 +50,6 @@
#include <QWebEngineHistory> #include <QWebEngineHistory>
#include <QClipboard> #include <QClipboard>
#include <QTouchEvent> #include <QTouchEvent>
#include <QPrintPreviewDialog>
bool WebView::s_forceContextMenuOnMouseRelease = false; bool WebView::s_forceContextMenuOnMouseRelease = false;

2
src/main/main.pro
View File

@ -1,6 +1,6 @@
include(../defines.pri) include(../defines.pri)
QT += webengine webenginewidgets network widgets printsupport sql script QT += webenginewidgets network widgets sql script
TARGET = qupzilla TARGET = qupzilla
mac: TARGET = QupZilla mac: TARGET = QupZilla