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

Added support for building with Wayland.

Browse Source 
See NO_X11 define in BUILDING.
This commit is contained in:
nowrep 2013-03-23 14:16:08 +01:00
parent 02b22acde0
commit 1d5d480c85
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILDING
View File

@ -127,6 +127,12 @@ Available Defines
Linux / Unix specific defines: Linux / Unix specific defines:
NO_X11 Disable all direct X11 calls.
Enable when building for Wayland.
example:
$ export NO_X11="true"
KDE For now, it just use better oxygen icons in Preferences. KDE For now, it just use better oxygen icons in Preferences.
Nepomuk integration is planned, and it will be enabled with Nepomuk integration is planned, and it will be enabled with
this define also. this define also.

2
src/defines.pri
View File

@ -62,6 +62,7 @@ d_no_system_datapath = $$(NO_SYSTEM_DATAPATH)
d_use_webgl = $$(USE_WEBGL) d_use_webgl = $$(USE_WEBGL)
d_w7api = $$(W7API) d_w7api = $$(W7API)
d_kde = $$(KDE) d_kde = $$(KDE)
d_nox11 = $$(NO_X11)
d_portable = $$(PORTABLE_BUILD) d_portable = $$(PORTABLE_BUILD)
d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS) d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
d_use_qtwebkit_2_2 = $$(USE_QTWEBKIT_2_2) d_use_qtwebkit_2_2 = $$(USE_QTWEBKIT_2_2)
@ -74,6 +75,7 @@ win32-msvc* {
equals(d_w7api, "true") { DEFINES *= W7API } equals(d_w7api, "true") { DEFINES *= W7API }
} }
equals(d_kde, "true") { DEFINES *= KDE } equals(d_kde, "true") { DEFINES *= KDE }
equals(d_nox11, "true") { DEFINES *= NO_X11 }
equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD } equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD }
equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS } equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS }
equals(d_use_qtwebkit_2_2, "true") { DEFINES *= USE_QTWEBKIT_2_2 } equals(d_use_qtwebkit_2_2, "true") { DEFINES *= USE_QTWEBKIT_2_2 }

8
src/lib/app/qupzilla.cpp
View File

@ -89,7 +89,7 @@
#include "qwebkitversion.h" #include "qwebkitversion.h"
#endif #endif
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#endif #endif
@ -2295,7 +2295,7 @@ void QupZilla::setMenuBookmarksAction(QAction* action)
QByteArray QupZilla::saveState(int version) const QByteArray QupZilla::saveState(int version) const
{ {
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
QByteArray data; QByteArray data;
QDataStream stream(&data, QIODevice::WriteOnly); QDataStream stream(&data, QIODevice::WriteOnly);
@ -2310,7 +2310,7 @@ QByteArray QupZilla::saveState(int version) const
bool QupZilla::restoreState(const QByteArray &state, int version) bool QupZilla::restoreState(const QByteArray &state, int version)
{ {
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
QByteArray windowState; QByteArray windowState;
int desktopId = -1; int desktopId = -1;
@ -2326,7 +2326,7 @@ bool QupZilla::restoreState(const QByteArray &state, int version)
#endif #endif
} }
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
int QupZilla::getCurrentVirtualDesktop() const int QupZilla::getCurrentVirtualDesktop() const
{ {
Display* display = static_cast<Display*>(QzTools::X11Display(this)); Display* display = static_cast<Display*>(QzTools::X11Display(this));

2
src/lib/app/qupzilla.h
View File

@ -245,7 +245,7 @@ private:
bool eventFilter(QObject* object, QEvent* event); bool eventFilter(QObject* object, QEvent* event);
#endif #endif
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
int getCurrentVirtualDesktop() const; int getCurrentVirtualDesktop() const;
void moveToVirtualDesktop(int desktopId); void moveToVirtualDesktop(int desktopId);
#endif #endif

2
src/lib/lib.pro
View File

@ -452,7 +452,7 @@ isEqual(QT_MAJOR_VERSION, 5) {
INSTALLS += target INSTALLS += target
LIBS += -lX11 !contains(DEFINES, NO_X11):LIBS += -lX11
RESOURCES -= data/certs.qrc RESOURCES -= data/certs.qrc
} }

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

@ -42,7 +42,7 @@
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QUrlQuery> #include <QUrlQuery>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#else #elif !defined(NO_X11)
#include <QX11Info> #include <QX11Info>
#endif #endif
@ -616,7 +616,7 @@ QString QzTools::escape(const QString &string)
#endif #endif
} }
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
void* QzTools::X11Display(const QWidget* widget) void* QzTools::X11Display(const QWidget* widget)
{ {
Q_UNUSED(widget) Q_UNUSED(widget)

2
src/lib/tools/qztools.h
View File

@ -71,7 +71,7 @@ QString QT_QUPZILLA_EXPORT operatingSystem();
bool QT_QUPZILLA_EXPORT isCertificateValid(const QSslCertificate &cert); bool QT_QUPZILLA_EXPORT isCertificateValid(const QSslCertificate &cert);
QString QT_QUPZILLA_EXPORT escape(const QString &string); QString QT_QUPZILLA_EXPORT escape(const QString &string);
#ifdef QZ_WS_X11 #if defined(QZ_WS_X11) && !defined(NO_X11)
void QT_QUPZILLA_EXPORT* X11Display(const QWidget* widget); void QT_QUPZILLA_EXPORT* X11Display(const QWidget* widget);
#endif #endif