tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 1.x

Browse source
This commit is contained in:
Albert Vaca 2017-09-18 20:49:46 +02:00
commit 17685d98c2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(kdeconnect) project(kdeconnect)
set(KDECONNECT_VERSION_MAJOR 1) set(KDECONNECT_VERSION_MAJOR 1)
set(KDECONNECT_VERSION_MINOR 1) set(KDECONNECT_VERSION_MINOR 2)
set(KDECONNECT_VERSION_PATCH 0) set(KDECONNECT_VERSION_PATCH 0)
set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}") set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")
@ -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(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(KF5DocTools)
find_package(Qca-qt5 2.1.0 REQUIRED) find_package(Qca-qt5 2.1.0 REQUIRED)

2
indicator/deviceindicator.cpp
View file

@ -74,7 +74,7 @@ DeviceIndicator::DeviceIndicator(DeviceDbusInterface* device)
auto battery = new BatteryAction(device); auto battery = new BatteryAction(device);
addAction(battery); addAction(battery);
setWhenAvailable(device->hasPlugin("kdeconnect_battery"), setWhenAvailable(device->hasPlugin("kdeconnect_battery"),
[this, battery](bool available) { battery->setVisible(available); } [battery](bool available) { battery->setVisible(available); }
, this); , this);
auto browse = addAction(i18n("Browse device")); auto browse = addAction(i18n("Browse device"));