Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ci/some unity build fixes #6580

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Ci/some unity build fixes #6580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d81c20b
partial fix for compilation with QT_NO_KEYWORDS
mgallien Mar 26, 2024
4e64316
ensure we ignore deprecated warnings from openssl in unity builds
mgallien Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/logbrowser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef LOGBROWSER_H
#define LOGBROWSER_H

#include <QCheckBox>

Check failure on line 18 in src/gui/logbrowser.h

View workflow job for this annotation

GitHub Actions / build

src/gui/logbrowser.h:18:10 [clang-diagnostic-error] 

'QCheckBox' file not found
#include <QPlainTextEdit>
#include <QTextStream>
#include <QFile>
Expand Down Expand Up @@ -43,7 +43,7 @@
protected:
void closeEvent(QCloseEvent *) override;

protected slots:
protected Q_SLOTS:
void togglePermanentLogging(bool enabled);
};

Expand Down
2 changes: 1 addition & 1 deletion src/gui/wizard/flow2authcredspage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#pragma once

#include <QList>

Check failure on line 18 in src/gui/wizard/flow2authcredspage.h

View workflow job for this annotation

GitHub Actions / build

src/gui/wizard/flow2authcredspage.h:18:10 [clang-diagnostic-error] 

'QList' file not found
#include <QMap>
#include <QNetworkCookie>
#include <QUrl>
Expand Down Expand Up @@ -51,7 +51,7 @@
void slotPollNow();
void slotStyleChanged();

signals:
Q_SIGNALS:
void connectToOCUrl(const QString &);
void pollNow();
void styleChanged();
Expand Down
4 changes: 2 additions & 2 deletions src/gui/wizard/flow2authwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef FLOW2AUTHWIDGET_H
#define FLOW2AUTHWIDGET_H

#include <QUrl>

Check failure on line 18 in src/gui/wizard/flow2authwidget.h

View workflow job for this annotation

GitHub Actions / build

src/gui/wizard/flow2authwidget.h:18:10 [clang-diagnostic-error] 

'QUrl' file not found
#include <QWidget>

#include "creds/flow2auth.h"
Expand Down Expand Up @@ -43,7 +43,7 @@
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();

Expand All @@ -52,7 +52,7 @@
QScopedPointer<Flow2Auth> _asyncAuth;
Ui_Flow2AuthWidget _ui{};

protected slots:
protected Q_SLOTS:
void slotOpenBrowser();
void slotCopyLinkToClipboard();

Expand Down
2 changes: 2 additions & 0 deletions src/libsync/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions src/libsync/clientsideencryption.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#define OPENSSL_SUPPRESS_DEPRECATED

#include "clientsideencryption.h"

#include <openssl/rsa.h>
Expand Down
Loading