[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ark] /: Find and link Qt5 Concurrent module
From:       Elvis Angelaccio <elvis.angelaccio () kdemail ! net>
Date:       2016-04-30 16:46:29
Message-ID: E1awY2H-0005Wc-Q1 () scm ! kde ! org
[Download RAW message or body]

Git commit a2a17102a28fb4d4f7c56eb072ea4cacac2fe567 by Elvis Angelaccio.
Committed on 30/04/2016 at 16:40.
Pushed by elvisangelaccio into branch 'master'.

Find and link Qt5 Concurrent module

Qt5 Concurrent is a separate module, so we need to find it and link to it.
This way we can #include <QtConcurrentRun> without hardcoding the module na=
me.

Most distros include this module in their "basic" qt5 package (e.g. qt5-bas=
e on
Archlinux), so this is not really a bug.

M  +1    -0    CMakeLists.txt
M  +1    -1    kerfuffle/CMakeLists.txt
M  +1    -1    kerfuffle/propertiesdialog.cpp

http://commits.kde.org/ark/a2a17102a28fb4d4f7c56eb072ea4cacac2fe567

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8726b1e..321e8a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ ecm_setup_version(${ARK_VERSION}
                   SOVERSION ${ARK_VERSION_MAJOR})
 =

 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
+    Concurrent
     Core
     Gui
     Widgets)
diff --git a/kerfuffle/CMakeLists.txt b/kerfuffle/CMakeLists.txt
index cbeeee4..4eaabaa 100644
--- a/kerfuffle/CMakeLists.txt
+++ b/kerfuffle/CMakeLists.txt
@@ -45,10 +45,10 @@ PUBLIC
     KF5::I18n
     KF5::WidgetsAddons
 PRIVATE
+    Qt5::Concurrent
     KF5::KIOCore
     KF5::KIOWidgets
     KF5::KIOFileWidgets
-
 )
 =

 set_target_properties(kerfuffle PROPERTIES VERSION ${KERFUFFLE_VERSION_STR=
ING} SOVERSION ${KERFUFFLE_SOVERSION})
diff --git a/kerfuffle/propertiesdialog.cpp b/kerfuffle/propertiesdialog.cpp
index c762af2..96e55af 100644
--- a/kerfuffle/propertiesdialog.cpp
+++ b/kerfuffle/propertiesdialog.cpp
@@ -29,7 +29,7 @@
 #include "ark_debug.h"
 #include "ui_propertiesdialog.h"
 =

-#include <QtConcurrent/QtConcurrentRun>
+#include <QtConcurrentRun>
 #include <QDateTime>
 #include <QFileInfo>
 #include <QFontDatabase>
[prev in list] [next in list] [prev in thread] [next in thread]