From 9f3b2b8fd4e7637a4c00fc23841f0884c7cd02c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 9 Oct 2017 13:39:34 +0100 Subject: [PATCH] Use qOverload in Qt signal/slots. --- CMakeLists.txt | 3 +++ src/util/externalcommand.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c69c0d1..a7fdd53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,9 @@ set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) set(SOVERSION "6") add_definitions(-D'VERSION="${VERSION}"') #" +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp index b38b1f2..fd6f4e9 100644 --- a/src/util/externalcommand.cpp +++ b/src/util/externalcommand.cpp @@ -20,6 +20,7 @@ #include "util/report.h" +#include #include #include @@ -61,7 +62,7 @@ void ExternalCommand::setup(const QProcess::ProcessChannelMode processChannelMod setEnvironment(QStringList() << QStringLiteral("LC_ALL=C") << QStringLiteral("PATH=") + QString::fromUtf8(getenv("PATH")) << QStringLiteral("LVM_SUPPRESS_FD_WARNINGS=1")); setProcessChannelMode(processChannelMode); - connect(this, static_cast(&QProcess::finished), this, &ExternalCommand::onFinished); + connect(this, qOverload(&QProcess::finished), this, &ExternalCommand::onFinished); connect(this, &ExternalCommand::readyReadStandardOutput, this, &ExternalCommand::onReadOutput); }