From 2e27310d7bc95cf1150d5cf1adf8c78bc1bc36e1 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 18 Sep 2017 20:03:36 +0200 Subject: [PATCH 1/3] Make sure we have KIO 5.38.0 It has a fix that is important for file transfer performance --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c5607f20..c1d8122ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DI find_package(Qt5 5.2 REQUIRED COMPONENTS Quick) -find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons) +find_package(KF5 5.38.0 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons) find_package(KF5DocTools) find_package(Qca-qt5 2.1.0 REQUIRED) From efaa7cbab100d8524a20e7e757fff45c1ba09010 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 18 Sep 2017 20:04:46 +0200 Subject: [PATCH 2/3] Fix warning --- indicator/deviceindicator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indicator/deviceindicator.cpp b/indicator/deviceindicator.cpp index 82f0b3af7..856bc6b11 100644 --- a/indicator/deviceindicator.cpp +++ b/indicator/deviceindicator.cpp @@ -74,7 +74,7 @@ DeviceIndicator::DeviceIndicator(DeviceDbusInterface* device) auto battery = new BatteryAction(device); addAction(battery); setWhenAvailable(device->hasPlugin("kdeconnect_battery"), - [this, battery](bool available) { battery->setVisible(available); } + [battery](bool available) { battery->setVisible(available); } , this); auto browse = addAction(i18n("Browse device")); From 23970a49948bec02d71848b7de7c84f43e3fce04 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 18 Sep 2017 20:13:54 +0200 Subject: [PATCH 3/3] Bump version to release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1d8122ae..04be2ce2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ project(kdeconnect) set(KDECONNECT_VERSION_MAJOR 1) -set(KDECONNECT_VERSION_MINOR 1) +set(KDECONNECT_VERSION_MINOR 2) set(KDECONNECT_VERSION_PATCH 0) set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")