Fix merge issues

8 years ago · 25b1583770
parent a578314e8e
commit 25b1583770
2 changed files with 3 additions and 3 deletions
--- a/src/lib/app/browserwindow.h
+++ b/src/lib/app/browserwindow.h
@ -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());
--- a/src/lib/tools/closedwindowsmanager.h
+++ b/src/lib/tools/closedwindowsmanager.h
@ -23,7 +23,7 @@
 #include "qzcommon.h"
 #include "browserwindow.h"

-class QUPZILLA_EXPORT ClosedWindowsManager : public QObject
+class FALKON_EXPORT ClosedWindowsManager : public QObject
 {
    Q_OBJECT