mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 18:56:34 +01:00
Fix merge issues
This commit is contained in:
parent
a578314e8e
commit
25b1583770
@ -71,8 +71,8 @@ public:
|
||||
bool isValid() const;
|
||||
void clear();
|
||||
|
||||
friend QUPZILLA_EXPORT QDataStream &operator<<(QDataStream &stream, const SavedWindow &window);
|
||||
friend QUPZILLA_EXPORT QDataStream &operator>>(QDataStream &stream, SavedWindow &window);
|
||||
friend FALKON_EXPORT QDataStream &operator<<(QDataStream &stream, const SavedWindow &window);
|
||||
friend FALKON_EXPORT QDataStream &operator>>(QDataStream &stream, SavedWindow &window);
|
||||
};
|
||||
|
||||
explicit BrowserWindow(Qz::BrowserWindowType type, const QUrl &url = QUrl());
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include "qzcommon.h"
|
||||
#include "browserwindow.h"
|
||||
|
||||
class QUPZILLA_EXPORT ClosedWindowsManager : public QObject
|
||||
class FALKON_EXPORT ClosedWindowsManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user