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

Fix merge issues

Browse Source
This commit is contained in:
David Rosca 2018-01-02 15:22:35 +01:00
parent a578314e8e
commit 25b1583770
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/app/browserwindow.h
View File

@ -71,8 +71,8 @@ public:
bool isValid() const; bool isValid() const;
void clear(); void clear();
friend QUPZILLA_EXPORT QDataStream &operator<<(QDataStream &stream, const SavedWindow &window); friend FALKON_EXPORT QDataStream &operator<<(QDataStream &stream, const SavedWindow &window);
friend QUPZILLA_EXPORT QDataStream &operator>>(QDataStream &stream, SavedWindow &window); friend FALKON_EXPORT QDataStream &operator>>(QDataStream &stream, SavedWindow &window);
}; };
explicit BrowserWindow(Qz::BrowserWindowType type, const QUrl &url = QUrl()); explicit BrowserWindow(Qz::BrowserWindowType type, const QUrl &url = QUrl());

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

@ -23,7 +23,7 @@
#include "qzcommon.h" #include "qzcommon.h"
#include "browserwindow.h" #include "browserwindow.h"
class QUPZILLA_EXPORT ClosedWindowsManager : public QObject class FALKON_EXPORT ClosedWindowsManager : public QObject
{ {
Q_OBJECT Q_OBJECT