From beeda24423e53469bc918b02a475641247e4227f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 4 Aug 2019 08:52:33 -0400 Subject: [PATCH] [libcalamaresui] Fix build of the PythonQt bindings - Change to std::chrono::seconds wasn't tried against the (optional) PythonQt bindings, leading to build failure. Reported by Phil (Manjaro). FIXES #1210 --- src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp index efb3da2a1..69027d018 100644 --- a/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp +++ b/src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp @@ -57,7 +57,7 @@ Utils::target_env_call( const QString& command, int timeout ) const { return CalamaresUtils::System::instance()-> - targetEnvCall( command, QString(), stdin, timeout ); + targetEnvCall( command, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) ); } @@ -67,7 +67,7 @@ Utils::target_env_call( const QStringList& args, int timeout ) const { return CalamaresUtils::System::instance()-> - targetEnvCall( args, QString(), stdin, timeout ); + targetEnvCall( args, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) ); } @@ -102,7 +102,7 @@ Utils::check_target_env_output( const QString& command, output, QString(), stdin, - timeout ); + std::chrono::seconds( timeout > 0 ? timeout : 0 ) ); _handle_check_target_env_call_error( ec, command ); return output; } @@ -119,7 +119,7 @@ Utils::check_target_env_output( const QStringList& args, output, QString(), stdin, - timeout ); + std::chrono::seconds( timeout > 0 ? timeout : 0 ) ); _handle_check_target_env_call_error( ec, args.join( ' ' ) ); return output; }