Commit 3091f1fb authored by Shashwat Jolly's avatar Shashwat Jolly

Merge branch 'master' of https://invent.kde.org/pim/kdepim-runtime into etesyncResource

parents fa71700c 2724ba3d
......@@ -4,15 +4,26 @@ include:
build_clazy_clang_tidy:
stage: build
image: debian:testing
image: kdeorg/ci-suse-qt514
extends: .linux
only:
- merge_requests
before_script:
- echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list
- apt-get update
- apt-get install --yes --no-install-recommends ninja-build clazy clang clang-tidy python python-yaml libkf5crash-dev libkf5purpose-dev libegl-dev jq
- zypper install -y clazy
- git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git $CI_TOOLING
- git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git $CI_TOOLING/repo-metadata
- git clone --depth=1 https://invent.kde.org/sysadmin/kde-build-metadata.git $CI_TOOLING/kde-build-metadata
- git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git $CI_TOOLING/kde-dev-scripts
script:
- srcdir=`pwd` && mkdir -p /tmp/pim_build && cd /tmp/pim_build && CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja $srcdir && cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json && cat compile_commands.aux.json | jq '[.[] | select(.file | contains("/synctex/")| not)]' > compile_commands.json && cp "$srcdir/.clang-tidy" .
- CLAZY_CHECKS="level0,level1,level2,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch" ninja
- run-clang-tidy
- export CXX=clazy
- export CC=clang
- export CXXFLAGS="-Wno-deprecated-declarations"
- export CLAZY_CHECKS="level0,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch"
- python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX
- python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo $INSTALL_PREFIX
- python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX
- cd build && run-clang-tidy
variables:
PLATFORM: SUSEQt5.14
BRANCH_GROUP: kf5-qt5
......@@ -64,7 +64,7 @@ include(ECMQtDeclareLoggingCategory)
include(GenerateExportHeader)
set(QT_REQUIRED_VERSION "5.12.0")
set(QT_REQUIRED_VERSION "5.13.0")
set(KDEPIMRUNTIME_LIB_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}")
set(KDEPIMRUNTIME_LIB_SOVERSION "5")
......
......@@ -242,11 +242,7 @@ EwsOAuthPrivate::EwsOAuthPrivate(EwsOAuth *parent, const QString &email, const Q
mOAuth2.setAuthorizationUrl(o365AuthorizationUrl);
mOAuth2.setAccessTokenUrl(o365AccessTokenUrl);
mOAuth2.setClientIdentifier(appId);
#if QTWEBENGINEWIDGETS_VERSION < QT_VERSION_CHECK(5, 13, 0)
mWebProfile.setRequestInterceptor(&mRequestInterceptor);
#else
mWebProfile.setUrlRequestInterceptor(&mRequestInterceptor);
#endif
mWebProfile.installUrlSchemeHandler("urn", &mSchemeHandler);
mWebView.setPage(&mWebPage);
......
......@@ -77,19 +77,11 @@ void QWebEngineProfile::setHttpUserAgent(const QString &ua)
mUserAgent = ua;
}
#if QTWEBENGINEWIDGETS_VERSION < QT_VERSION_CHECK(5, 13, 0)
void QWebEngineProfile::setRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor)
{
mInterceptor = interceptor;
}
#else
void QWebEngineProfile::setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor)
{
mInterceptor = interceptor;
}
#endif
void QWebEngineProfile::installUrlSchemeHandler(QByteArray const &scheme, QWebEngineUrlSchemeHandler *handler)
{
mScheme = QString::fromLatin1(scheme);
......
......@@ -101,11 +101,7 @@ public:
~QWebEngineProfile() override;
void setHttpUserAgent(const QString &ua);
#if QTWEBENGINEWIDGETS_VERSION < QT_VERSION_CHECK(5, 13, 0)
void setRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
#else
void setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
#endif
void installUrlSchemeHandler(QByteArray const &scheme, QWebEngineUrlSchemeHandler *handler);
Q_SIGNALS:
void logEvent(const QString &event);
......
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Google Groupware
Name[cs]=Google Groupware
Name[es]=Google Groupware
Name[et]=Google Groupware
Name[fr]=Google Groupware
Name[it]=Google Groupware
Name[nl]=Google Groupware
Name[pt]='Groupware' do Google
......@@ -19,6 +20,7 @@ Comment[ca@valencia]=Accediu als calendaris, contactes i tasques de Google des d
Comment[cs]=Přistupujte ke k kalendářům, kontaktům a úkolům z KDE
Comment[es]=Acceda a sus calendarios, contactos y tareas de Google desde KDE
Comment[et]=Oma Google'i kalendrite, kontaktide ja ülesannete kasutamine otse KDE-st
Comment[fr]=Accès à vos agendas, contacts et tâches Google depuis KDE
Comment[it]=Accedi ai tuoi calendari, contatti e attività Google da KDE
Comment[nl]=Heb toegang tot uw Google agenda's, contactpersonen en taken vanuit KDE
Comment[pt]=Aceda aos seus calendários, contactos e tarefas da Google a partir do KDE
......
......@@ -647,28 +647,16 @@ void getRecurrence(T &i, const I &e)
}
const QVector<int> bySecondsVector = defaultRR->bySeconds().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setBysecond(bySecondsVector.toStdVector());
#else
const auto stdVectorBySeconds = std::vector<int>(bySecondsVector.begin(), bySecondsVector.end());
rrule.setBysecond(stdVectorBySeconds);
#endif
const QVector<int> byMinutesVector = defaultRR->byMinutes().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setByminute(byMinutesVector.toStdVector());
#else
const auto stdVectorByMinutes = std::vector<int>(byMinutesVector.begin(), byMinutesVector.end());
rrule.setByminute(stdVectorByMinutes);
#endif
const QVector<int> byHoursVector = defaultRR->byHours().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setByhour(byHoursVector.toStdVector());
#else
const auto stdVectorByHours = std::vector<int>(byHoursVector.begin(), byHoursVector.end());
rrule.setByhour(stdVectorByHours);
#endif
std::vector<Kolab::DayPos> daypos;
daypos.reserve(defaultRR->byDays().count());
......@@ -678,39 +666,23 @@ void getRecurrence(T &i, const I &e)
rrule.setByday(daypos);
const QVector<int> bymonthdayVector = defaultRR->byMonthDays().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setBymonthday(bymonthdayVector.toStdVector());
#else
const auto stdByMonthDayVector = std::vector<int>(bymonthdayVector.begin(), bymonthdayVector.end());
rrule.setBymonthday(stdByMonthDayVector);
#endif
const QVector<int> byYearDaysVector = defaultRR->byYearDays().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setByyearday(byYearDaysVector.toStdVector());
#else
const auto stdByYearDayVector = std::vector<int>(byYearDaysVector.begin(), byYearDaysVector.end());
rrule.setByyearday(stdByYearDayVector);
#endif
const QVector<int> byWeekNumberVector = defaultRR->byWeekNumbers().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setByweekno(byWeekNumberVector.toStdVector());
#else
const auto stdWeekNumberVector = std::vector<int>(byWeekNumberVector.begin(), byWeekNumberVector.end());
rrule.setByweekno(stdWeekNumberVector);
#endif
const QVector<int> byMonthVector = defaultRR->byMonths().toVector();
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
rrule.setBymonth(byMonthVector.toStdVector());
#else
const auto stdByMonthVector = std::vector<int>(byMonthVector.begin(), byMonthVector.end());
rrule.setBymonth(stdByMonthVector);
#endif
i.setRecurrenceRule(rrule);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment