mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 05:15:40 +03:00
fix compilation issues after rebase
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
parent
8ad2a82ea9
commit
aae9e84438
11 changed files with 19 additions and 46 deletions
|
@ -51,19 +51,6 @@ else()
|
|||
)
|
||||
endif()
|
||||
|
||||
find_package(Qt${QT_MAJOR_VERSION}WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET)
|
||||
if(NOT BUILD_WITH_WEBENGINE)
|
||||
set_package_properties(Qt${QT_MAJOR_VERSION}WebEngine PROPERTIES
|
||||
DESCRIPTION "Qt${QT_MAJOR_VERSION} WebEngine component."
|
||||
TYPE RECOMMENDED
|
||||
)
|
||||
else()
|
||||
set_package_properties(Qt${QT_MAJOR_VERSION}WebEngine PROPERTIES
|
||||
DESCRIPTION "Qt${QT_MAJOR_VERSION} WebEngine component."
|
||||
TYPE REQUIRED
|
||||
)
|
||||
endif()
|
||||
|
||||
find_package(Qt${QT_VERSION_MAJOR}WebEngineCore ${REQUIRED_QT_VERSION} CONFIG QUIET)
|
||||
if(APPLE)
|
||||
set_package_properties(Qt${QT_VERSION_MAJOR}WebEngineCore PROPERTIES
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include "remotepermissions.h"
|
||||
|
||||
#include <QVariant>
|
||||
#include <QLoggingCategory>
|
||||
|
||||
#include <cstring>
|
||||
|
|
|
@ -1,18 +1,7 @@
|
|||
project(gui)
|
||||
find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 QuickWidgets Xml Network)
|
||||
find_package(KF5Archive REQUIRED)
|
||||
find_package(KF5GuiAddons)
|
||||
|
||||
if(QUICK_COMPILER)
|
||||
if (${QT_VERSION_MAJOR} STREQUAL "5")
|
||||
set(REQUIRED_QT_VERSION "5.15.0")
|
||||
find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED QuickCompiler)
|
||||
set_package_properties(Qt5QuickCompiler PROPERTIES
|
||||
DESCRIPTION "Compile QML at build time"
|
||||
TYPE REQUIRED
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
find_package(KF6Archive REQUIRED)
|
||||
find_package(KF6GuiAddons)
|
||||
|
||||
if (NOT TARGET Qt::GuiPrivate)
|
||||
message(FATAL_ERROR "Could not find GuiPrivate component of Qt. It might be shipped as a separate package, please check that.")
|
||||
|
@ -58,11 +47,7 @@ set(client_UI_SRCS
|
|||
wizard/welcomepage.ui
|
||||
)
|
||||
|
||||
if(Qt5QuickCompiler_FOUND)
|
||||
qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
|
||||
else()
|
||||
qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
|
||||
endif()
|
||||
qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
|
||||
|
||||
set(client_SRCS
|
||||
accountmanager.h
|
||||
|
@ -406,7 +391,7 @@ set( final_src
|
|||
)
|
||||
|
||||
if(Qt${QT_MAJOR_VERSION}Keychain_FOUND)
|
||||
list(APPEND libsync_LINK_TARGETS qt5keychain)
|
||||
list(APPEND libsync_LINK_TARGETS Qt6::keychain)
|
||||
endif()
|
||||
|
||||
# add executable icon on windows and osx
|
||||
|
@ -568,13 +553,13 @@ target_link_libraries(nextcloudCore
|
|||
Qt::Quick
|
||||
Qt::QuickControls2
|
||||
Qt::QuickWidgets
|
||||
KF5::Archive
|
||||
KF6::Archive
|
||||
)
|
||||
|
||||
if(KF5GuiAddons_FOUND)
|
||||
if(KF6GuiAddons_FOUND)
|
||||
target_link_libraries(nextcloudCore
|
||||
PUBLIC
|
||||
KF5::GuiAddons
|
||||
KF6::GuiAddons
|
||||
)
|
||||
add_definitions(-DHAVE_KGUIADDONS)
|
||||
endif()
|
||||
|
@ -591,7 +576,7 @@ foreach(FILE IN LISTS client_UI_SRCS)
|
|||
set_property(SOURCE ${FILE} PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
|
||||
endforeach()
|
||||
|
||||
if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
|
||||
if(Qt6WebEngine_FOUND AND Qt6WebEngineWidgets_FOUND)
|
||||
target_link_libraries(nextcloudCore PUBLIC Qt::WebEngineWidgets)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -321,7 +321,7 @@ void AccountState::checkConnectivity()
|
|||
|
||||
// If we don't reset the ssl config a second CheckServerJob can produce a
|
||||
// ssl config that does not have a sensible certificate chain.
|
||||
account()->setSslConfiguration(QSslConfiguration());
|
||||
account()->setSslConfiguration(QSslConfiguration::defaultConfiguration());
|
||||
//#endif
|
||||
conValidator->checkServerAndAuth();
|
||||
}
|
||||
|
|
|
@ -530,7 +530,7 @@ void Application::setupConfigFile()
|
|||
QT_WARNING_POP
|
||||
setApplicationName(_theme->appName());
|
||||
|
||||
auto oldDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
|
||||
auto oldDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
|
||||
|
||||
// macOS 10.11.x does not like trailing slash for rename/move.
|
||||
if (oldDir.endsWith('/')) {
|
||||
|
|
|
@ -572,6 +572,7 @@ void Folder::slotWatchedPathChanged(const QStringView &path, const ChangeReason
|
|||
if (!pinState || *pinState != PinState::Excluded) {
|
||||
if (!_vfs->setPinState(relativePath.toString(), PinState::Excluded)) {
|
||||
qCWarning(lcFolder) << "Could not set pin state of" << relativePath << "to excluded";
|
||||
}
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
#include <QObject>
|
||||
#include <QStringList>
|
||||
#include <QUuid>
|
||||
#include <QSet>
|
||||
|
||||
#include <set>
|
||||
#include <chrono>
|
||||
#include <memory>
|
||||
|
|
|
@ -310,7 +310,7 @@ void GeneralSettings::slotUpdateInfo()
|
|||
if (ocupdater) {
|
||||
connect(ocupdater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
|
||||
connect(_ui->restartButton, &QAbstractButton::clicked, ocupdater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
|
||||
connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
|
||||
//connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
|
||||
|
||||
QString status = ocupdater->statusString(OCUpdater::UpdateStatusStringFormat::Html);
|
||||
Theme::replaceLinkColorStringBackgroundAware(status);
|
||||
|
|
|
@ -162,7 +162,7 @@ void OwncloudSetupWizard::slotCheckServer(const QString &urlString)
|
|||
|
||||
// And also reset the QSslConfiguration, for the same reason (#6832)
|
||||
// Here the client certificate is added, if any. Later it'll be in HttpCredentials
|
||||
account->setSslConfiguration(QSslConfiguration());
|
||||
account->setSslConfiguration(QSslConfiguration::defaultConfiguration());
|
||||
auto sslConfiguration = account->getOrCreateSslConfig(); // let Account set defaults
|
||||
if (!_ocWizard->_clientSslCertificate.isNull()) {
|
||||
sslConfiguration.setLocalCertificate(_ocWizard->_clientSslCertificate);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
project(libsync)
|
||||
find_package(KF5Archive REQUIRED)
|
||||
find_package(KF6Archive REQUIRED)
|
||||
include(DefinePlatformDefaults)
|
||||
|
||||
set(CMAKE_AUTOMOC TRUE)
|
||||
|
@ -211,7 +211,7 @@ target_link_libraries(nextcloudsync
|
|||
Qt::WebSockets
|
||||
Qt::Xml
|
||||
Qt::Sql
|
||||
KF5::Archive
|
||||
KF6::Archive
|
||||
Qt::Core5Compat
|
||||
)
|
||||
|
||||
|
@ -222,9 +222,6 @@ target_compile_features(nextcloudsync
|
|||
|
||||
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)
|
||||
|
||||
if (NOT TOKEN_AUTH_ONLY)
|
||||
find_package(Qt${QT_MAJOR_VERSION} COMPONENTS REQUIRED Widgets Svg)
|
||||
target_link_libraries(nextcloudsync PUBLIC Qt::Widgets Qt::Svg Qt${QT_MAJOR_VERSION}Keychain::Qt${QT_MAJOR_VERSION}Keychain)
|
||||
|
|
|
@ -599,7 +599,7 @@ QByteArray FolderMetadata::encryptedMetadata()
|
|||
|
||||
QJsonObject files, folders;
|
||||
for (auto it = _files.constBegin(), end = _files.constEnd(); it != end; ++it) {
|
||||
const auto file = convertFileToJsonObject(it);
|
||||
const auto file = convertFileToJsonObject(&(*it));
|
||||
if (file.isEmpty()) {
|
||||
qCDebug(lcCseMetadata) << "Metadata generation failed for file" << it->encryptedFilename;
|
||||
return {};
|
||||
|
|
Loading…
Reference in a new issue