[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Merge remote-tracking branch 'origin/Applications/15.12'
From: Montel Laurent <montel () kde ! org>
Date: 2015-11-23 20:33:13
Message-ID: E1a0xnV-0005BQ-DG () scm ! kde ! org
[Download RAW message or body]
Git commit 65c7610c8c3dd3c5c3a8bef867e558a2cfcabaec by Montel Laurent.
Committed on 23/11/2015 at 20:33.
Pushed by mlaurent into branch 'master'.
Merge remote-tracking branch 'origin/Applications/15.12'
M +1 -1 CMakeLists.txt
M +1 -1 calendarsupport/CMakeLists.txt
M +1 -1 composereditor-ng/CMakeLists.txt
M +1 -1 eventviews/CMakeLists.txt
M +1 -1 incidenceeditor-ng/CMakeLists.txt
M +1 -1 kaddressbookgrantlee/CMakeLists.txt
M +1 -1 libfollowupreminder/CMakeLists.txt
M +1 -1 libkdepim/CMakeLists.txt
M +1 -1 libkdepimdbusinterfaces/CMakeLists.txt
M +1 -1 libksieve/CMakeLists.txt
M +1 -1 libsendlater/CMakeLists.txt
M +1 -1 mailcommon/CMakeLists.txt
M +1 -1 mailimporter/CMakeLists.txt
M +1 -1 messagecomposer/CMakeLists.txt
M +1 -1 messagecore/CMakeLists.txt
M +1 -1 messagelist/CMakeLists.txt
M +1 -1 messageviewer/CMakeLists.txt
M +1 -1 noteshared/CMakeLists.txt
M +1 -1 pimcommon/CMakeLists.txt
M +1 -1 templateparser/CMakeLists.txt
http://commits.kde.org/kdepim/65c7610c8c3dd3c5c3a8bef867e558a2cfcabaec
diff --cc CMakeLists.txt
index 6c799cc,1a5f7aa..b393548
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -95,7 -95,7 +95,7 @@@ set(KDEPIM_VERSION_NUMBER "5.1.40"
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
=
=
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
set(KCONTACTS_LIB_VERSION "4.92.0")
set(KCALENDARCORE_LIB_VERSION "4.81.0")
set(IDENTITYMANAGEMENT_LIB_VERSION "4.82.0")
diff --cc calendarsupport/CMakeLists.txt
index d57b659,86d8fab..54b2757
--- a/calendarsupport/CMakeLists.txt
+++ b/calendarsupport/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(CALENDARUTILS_LIB_VERSION "4.80.0")
diff --cc composereditor-ng/CMakeLists.txt
index fcce7ec,1174a65..a457fc0
--- a/composereditor-ng/CMakeLists.txt
+++ b/composereditor-ng/CMakeLists.txt
@@@ -23,11 -23,11 +23,11 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
-set(KPIMTEXTEDIT_LIB_VERSION "4.91.0")
+set(KPIMTEXTEDIT_LIB_VERSION "5.1.41")
=
=
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
diff --cc eventviews/CMakeLists.txt
index b09d763,b0aa226..9f609f9
--- a/eventviews/CMakeLists.txt
+++ b/eventviews/CMakeLists.txt
@@@ -23,8 -23,8 +23,8 @@@ include(ECMAddTests
=
set(KF5_VERSION "5.16.0")
set(CALENDARUTILS_LIB_VERSION "4.80.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KCALENDARCORE_LIB_VERSION "4.81.0")
set(AKONADICALENDAR_LIB_VERSION "4.80.0")
diff --cc incidenceeditor-ng/CMakeLists.txt
index c4ff3a0,12ce98b..b49f1d9
--- a/incidenceeditor-ng/CMakeLists.txt
+++ b/incidenceeditor-ng/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(KMAILTRANSPORT_LIB_VERSION "4.78.0")
diff --cc kaddressbookgrantlee/CMakeLists.txt
index 27938dd,c480792..1bb55c0
--- a/kaddressbookgrantlee/CMakeLists.txt
+++ b/kaddressbookgrantlee/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KCONTACTS_LIB_VERSION "4.92.0")
=
diff --cc libfollowupreminder/CMakeLists.txt
index 417b9a3,d73c72c..72e1b6a
--- a/libfollowupreminder/CMakeLists.txt
+++ b/libfollowupreminder/CMakeLists.txt
@@@ -22,9 -22,9 +22,9 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
-set(KDEPIM_LIB_VERSION "5.0.80")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
=
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui)
find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
diff --cc libkdepim/CMakeLists.txt
index 568314e,5bc4251..61f8419
--- a/libkdepim/CMakeLists.txt
+++ b/libkdepim/CMakeLists.txt
@@@ -21,8 -21,8 +21,8 @@@ include(ECMQtDeclareLoggingCategory
include(ECMAddTests)
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(KLDAP_LIB_VERSION "4.80.0")
diff --cc libkdepimdbusinterfaces/CMakeLists.txt
index dd81063,cf37d47..d7edcd2
--- a/libkdepimdbusinterfaces/CMakeLists.txt
+++ b/libkdepimdbusinterfaces/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
=
diff --cc libksieve/CMakeLists.txt
index 3f7ee3d,b0323c3..bf8dbe6
--- a/libksieve/CMakeLists.txt
+++ b/libksieve/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(IDENTITYMANAGEMENT_LIB_VERSION "4.80.0")
diff --cc libsendlater/CMakeLists.txt
index de0adb2,ab2aef8..5f8b814
--- a/libsendlater/CMakeLists.txt
+++ b/libsendlater/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
=
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
diff --cc mailcommon/CMakeLists.txt
index d4620b2,985a85c..75dc6d1
--- a/mailcommon/CMakeLists.txt
+++ b/mailcommon/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(KMAILTRANSPORT_LIB_VERSION "4.78.0")
diff --cc mailimporter/CMakeLists.txt
index 38bcba8,77a33ca..47d0966
--- a/mailimporter/CMakeLists.txt
+++ b/mailimporter/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
=
diff --cc messagecomposer/CMakeLists.txt
index 6d9b30e,9b52c82..4291ace
--- a/messagecomposer/CMakeLists.txt
+++ b/messagecomposer/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(KLDAP_LIB_VERSION "4.80.0")
diff --cc messagecore/CMakeLists.txt
index 94ecfb5,bda0c18..6dd01da
--- a/messagecore/CMakeLists.txt
+++ b/messagecore/CMakeLists.txt
@@@ -22,11 -22,11 +22,11 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
-set(KPIMTEXTEDIT_LIB_VERSION "4.91.0")
+set(KPIMTEXTEDIT_LIB_VERSION "5.1.41")
=
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTo=
ols Network)
diff --cc messagelist/CMakeLists.txt
index 082ba29,95a7fc4..9f48a7a
--- a/messagelist/CMakeLists.txt
+++ b/messagelist/CMakeLists.txt
@@@ -23,8 -23,8 +23,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
=
diff --cc messageviewer/CMakeLists.txt
index bbd6901,32c6fcd..cf04613
--- a/messageviewer/CMakeLists.txt
+++ b/messageviewer/CMakeLists.txt
@@@ -22,8 -22,8 +22,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(KCONTACTS_LIB_VERSION "4.92.0")
diff --cc noteshared/CMakeLists.txt
index 4f03f1f,582ce3f..b0059b9
--- a/noteshared/CMakeLists.txt
+++ b/noteshared/CMakeLists.txt
@@@ -24,8 -24,8 +24,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(AKONADINOTES_LIB_VERSION "4.78.0")
diff --cc pimcommon/CMakeLists.txt
index 2238f64,0e06ea5..34e0f01
--- a/pimcommon/CMakeLists.txt
+++ b/pimcommon/CMakeLists.txt
@@@ -23,8 -23,8 +23,8 @@@ include(ECMAddTests
include(ECMInstallIcons)
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(KIMAP_LIB_VERSION "4.78.0")
diff --cc templateparser/CMakeLists.txt
index a476b83,824a96d..7b4d55a
--- a/templateparser/CMakeLists.txt
+++ b/templateparser/CMakeLists.txt
@@@ -23,8 -23,8 +23,8 @@@ include(ECMAddTests
=
=
set(KF5_VERSION "5.16.0")
- set(KDEPIMLIBS_LIB_VERSION "5.1.40")
-set(KDEPIMLIBS_LIB_VERSION "5.0.81")
-set(KDEPIM_LIB_VERSION "5.0.80")
++set(KDEPIMLIBS_LIB_VERSION "5.1.41")
+set(KDEPIM_LIB_VERSION "5.1.40")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
set(IDENTITYMANAGEMENT_LIB_VERSION "4.80.0")
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic