[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Merge remote-tracking branch 'origin/Applications/16.08'
From: Montel Laurent <montel () kde ! org>
Date: 2016-07-31 19:13:06
Message-ID: E1bTwAc-0002u9-US () code ! kde ! org
[Download RAW message or body]
Git commit dec4af96b7013642ad12680389cdedc4d26158cf by Montel Laurent.
Committed on 31/07/2016 at 19:12.
Pushed by mlaurent into branch 'master'.
Merge remote-tracking branch 'origin/Applications/16.08'
M +1 -1 CMakeLists.txt
M +1 -1 accountwizard/CMakeLists.txt
M +1 -1 akonadiconsole/CMakeLists.txt
M +1 -1 akregator/CMakeLists.txt
M +1 -1 blogilo/CMakeLists.txt
M +1 -1 grantleeeditor/CMakeLists.txt
M +1 -1 importwizard/CMakeLists.txt
M +1 -1 kmail/CMakeLists.txt
M +1 -1 sieveeditor/CMakeLists.txt
http://commits.kde.org/kdepim/dec4af96b7013642ad12680389cdedc4d26158cf
diff --cc CMakeLists.txt
index b5aab70,39c5407..ceddd34
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -133,19 -133,20 +133,19 @@@ else(
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test =
Sql Concurrent UiTools WebEngine WebEngineWidgets)
find_package(Qt5X11Extras NO_MODULE)
find_package(Grantlee5 "5.1" CONFIG REQUIRED)
- set(LIBGRAVATAR_VERSION_LIB "5.2.90")
- set(LIBMAILIMPORTER_VERSION_LIB "5.2.90")
- set(MAILCOMMON_LIB_VERSION_LIB "5.2.90")
- set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(LIBKLEO_LIB_VERSION_LIB "5.2.90")
- set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.90")
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
- set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.2.90")
- set(CALENDARSUPPORT_LIB_VERSION_LIB "5.2.90")
- set(EVENTVIEW_LIB_VERSION_LIB "5.2.90")
- set(KDGANTT2_LIB_VERSION_LIB "5.2.90")
- set(LIBKSIEVE_LIB_VERSION_LIB "5.2.90")
+ set(LIBGRAVATAR_VERSION_LIB "5.3.40")
+ set(LIBMAILIMPORTER_VERSION_LIB "5.3.40")
+ set(MAILCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(KDEPIM_APPS_LIB_VERSION_LIB "5.3.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(LIBKLEO_LIB_VERSION_LIB "5.3.40")
+ set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.3.40")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
+ set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.3.41")
+ set(CALENDARSUPPORT_LIB_VERSION_LIB "5.3.41")
+ set(EVENTVIEW_LIB_VERSION_LIB "5.3.40")
+ set(LIBKSIEVE_LIB_VERSION_LIB "5.3.42")
=
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG =
REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
diff --cc accountwizard/CMakeLists.txt
index b3d208e,3f95fc0..c420be2
--- a/accountwizard/CMakeLists.txt
+++ b/accountwizard/CMakeLists.txt
@@@ -54,10 -54,10 +54,10 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accou
set(QT_REQUIRED_VERSION "5.6.0")
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enter=
prise branch, which are normally disabled. Also, it disables many component=
s not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml D=
Bus Test)
- set(MAILCOMMON_LIB_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
+ set(MAILCOMMON_LIB_VERSION_LIB "5.3.41")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
=
# Find KF5 package
find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
diff --cc akonadiconsole/CMakeLists.txt
index f5d92cf,386b3d4..224b674
--- a/akonadiconsole/CMakeLists.txt
+++ b/akonadiconsole/CMakeLists.txt
@@@ -50,13 -50,13 +50,13 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akona
=
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus =
Sql)
- set(LIBMAILIMPORTER_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(LIBKLEO_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
- set(KCALENDARCORE_LIB_VERSION "5.2.90")
- set(KCONTACTS_LIB_VERSION "5.2.92")
- set(KMIME_LIB_VERSION "5.2.90")
+ set(LIBMAILIMPORTER_VERSION_LIB "5.3.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(LIBKLEO_LIB_VERSION_LIB "5.3.40")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
+ set(KCALENDARCORE_LIB_VERSION "5.3.40")
+ set(KCONTACTS_LIB_VERSION "5.3.42")
+ set(KMIME_LIB_VERSION "5.3.40")
=
# Find KF5 package
find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
diff --cc akregator/CMakeLists.txt
index f87b97c,da3aabc..6aa4029
--- a/akregator/CMakeLists.txt
+++ b/akregator/CMakeLists.txt
@@@ -40,14 -40,14 +40,14 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akreg
=
set(QT_REQUIRED_VERSION "5.6.0")
=
- set(KONTACTINTERFACE_LIB_VERSION "5.2.90")
- set(KPIMTEXTEDIT_LIB_VERSION "5.2.90")
- set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
- set(LIBKLEO_LIB_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(SYNDICATION_LIB_VERSION "5.2.90")
+ set(KONTACTINTERFACE_LIB_VERSION "5.3.40")
+ set(KPIMTEXTEDIT_LIB_VERSION "5.3.40")
+ set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.3.40")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
+ set(LIBKLEO_LIB_VERSION_LIB "5.3.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(SYNDICATION_LIB_VERSION "5.3.40")
=
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test =
WebEngine WebEngineWidgets)
find_package(Grantlee5 "5.1" CONFIG REQUIRED)
diff --cc blogilo/CMakeLists.txt
index b84c450,f32604d..f6a6bbc
--- a/blogilo/CMakeLists.txt
+++ b/blogilo/CMakeLists.txt
@@@ -45,9 -45,9 +45,9 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogi
=
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test =
Sql WebEngine WebEngineWidgets)
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
# Find KF5 package
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
diff --cc grantleeeditor/CMakeLists.txt
index 17627da,9bcd219..da92849
--- a/grantleeeditor/CMakeLists.txt
+++ b/grantleeeditor/CMakeLists.txt
@@@ -33,17 -33,17 +33,17 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grant
endif()
=
=
- set(KDEPIM_VERSION_NUMBER "5.2.90")
+ set(KDEPIM_VERSION_NUMBER "5.3.40")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
=
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(AKONADI_MIMELIB_VERSION "5.2.90")
- set(KPIMTEXTEDIT_LIB_VERSION "5.2.90")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(AKONADI_MIMELIB_VERSION "5.3.40")
+ set(KPIMTEXTEDIT_LIB_VERSION "5.3.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
- set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.90")
- set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.90")
- set(LIBKLEO_LIB_VERSION_LIB "5.2.90")
+ set(KDEPIM_APPS_LIB_VERSION_LIB "5.3.40")
+ set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.3.40")
+ set(LIBKLEO_LIB_VERSION_LIB "5.3.40")
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets WebEn=
gine WebEngineWidgets)
=
diff --cc importwizard/CMakeLists.txt
index d3393e9,c279e45..ee67896
--- a/importwizard/CMakeLists.txt
+++ b/importwizard/CMakeLists.txt
@@@ -46,13 -46,13 +46,13 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${impor
=
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
- set(LIBMAILIMPORTER_VERSION_LIB "5.2.90")
- set(MAILCOMMON_LIB_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
- set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.90")
- set(KCONTACTS_LIB_VERSION "5.2.92")
+ set(LIBMAILIMPORTER_VERSION_LIB "5.3.40")
+ set(MAILCOMMON_LIB_VERSION_LIB "5.3.41")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
+ set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.41")
+ set(KCONTACTS_LIB_VERSION "5.3.42")
=
# Find KF5 package
find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
diff --cc kmail/CMakeLists.txt
index af75d8a,0a47bc1..5908fbe
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@@ -61,14 -61,14 +61,14 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail
set(QT_REQUIRED_VERSION "5.6.0")
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enter=
prise branch, which are normally disabled. Also, it disables many component=
s not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network =
Test Widgets WebEngine WebEngineWidgets Xml)
- set(LIBGRAVATAR_VERSION_LIB "5.2.90")
- set(MAILCOMMON_LIB_VERSION_LIB "5.2.90")
- set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.90")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(LIBKLEO_LIB_VERSION_LIB "5.2.90")
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(LIBKDEPIM_LIB_VERSION_LIB "5.2.90")
- set(LIBKSIEVE_LIB_VERSION_LIB "5.2.90")
+ set(LIBGRAVATAR_VERSION_LIB "5.3.40")
+ set(MAILCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(KDEPIM_APPS_LIB_VERSION_LIB "5.3.40")
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(LIBKLEO_LIB_VERSION_LIB "5.3.40")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
+ set(LIBKDEPIM_LIB_VERSION_LIB "5.3.40")
+ set(LIBKSIEVE_LIB_VERSION_LIB "5.3.42")
=
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG =
REQUIRED)
set(WEBENGINE_TYPE "QtWebEngine")
diff --cc sieveeditor/CMakeLists.txt
index 40deea6,a2bb54f..fad16a8
--- a/sieveeditor/CMakeLists.txt
+++ b/sieveeditor/CMakeLists.txt
@@@ -41,9 -41,9 +41,9 @@@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieve
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
=
- set(MESSAGELIB_LIB_VERSION_LIB "5.3.43")
- set(MESSAGELIB_LIB_VERSION_LIB "5.2.94")
- set(PIMCOMMON_LIB_VERSION_LIB "5.2.90")
- set(LIBKSIEVE_LIB_VERSION_LIB "5.2.90")
++ set(MESSAGELIB_LIB_VERSION_LIB "5.3.44")
+ set(LIBKSIEVE_LIB_VERSION_LIB "5.3.42")
+ set(PIMCOMMON_LIB_VERSION_LIB "5.3.41")
=
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Netwo=
rk Test)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic