Merge pull request #6580 from nextcloud/ci/someUnityBuildFixes

Ci/some unity build fixes

src/gui/logbrowser.h

@@ -43,7 +43,7 @@ public:
 protected:
     void closeEvent(QCloseEvent *) override;
 
-protected slots:
+protected Q_SLOTS:
     void togglePermanentLogging(bool enabled);
 };
 

src/gui/wizard/flow2authcredspage.h

@@ -51,7 +51,7 @@ public Q_SLOTS:
     void slotPollNow();
     void slotStyleChanged();
 
-signals:
+Q_SIGNALS:
     void connectToOCUrl(const QString &);
     void pollNow();
     void styleChanged();

src/gui/wizard/flow2authwidget.h

@@ -43,7 +43,7 @@ public Q_SLOTS:
     void slotStatusChanged(Flow2Auth::PollStatus status, int secondsLeft);
     void slotStyleChanged();
 
-signals:
+Q_SIGNALS:
     void authResult(Flow2Auth::Result, const QString &errorString, const QString &user, const QString &appPassword);
     void pollNow();
 
@@ -52,7 +52,7 @@ private:
     QScopedPointer<Flow2Auth> _asyncAuth;
     Ui_Flow2AuthWidget _ui{};
 
-protected slots:
+protected Q_SLOTS:
     void slotOpenBrowser();
     void slotCopyLinkToClipboard();
 

src/libsync/CMakeLists.txt

@@ -219,6 +219,8 @@ target_compile_features(nextcloudsync
         cxx_std_17
 )
 
+target_compile_definitions(nextcloudsync PRIVATE OPENSSL_SUPPRESS_DEPRECATED)
+
 find_package(Qt5 REQUIRED COMPONENTS Gui Widgets Svg)
 target_link_libraries(nextcloudsync PUBLIC Qt5::Gui Qt5::Widgets Qt5::Svg)
 

src/libsync/clientsideencryption.cpp

@@ -1,5 +1,3 @@
-#define OPENSSL_SUPPRESS_DEPRECATED
-
 #include "clientsideencryption.h"
 
 #include <openssl/rsa.h>