diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-12 10:24:36 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-12 10:24:36 +0200 |
| commit | fc2f96ffcbd13fbfda3159c826ec2a30942e32b3 (patch) | |
| tree | 8989b63c4f8c4f1e16e8b011304f9ce613b9a56a | |
| parent | 2ed68129da49233b82840487fa798969718cbd2b (diff) | |
| parent | af41770a375fa7ea3755d3bc4cca2dd276b01aa6 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Change-Id: I6ab5059ec3b4c9940db1061b9f5afe458be4d416
| -rw-r--r-- | usagestatistic.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usagestatistic.pro b/usagestatistic.pro index e0acd5e..fed7d71 100644 --- a/usagestatistic.pro +++ b/usagestatistic.pro @@ -100,7 +100,7 @@ QTC_PLUGIN_RECOMMENDS += \ -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH})\"") # "Build" extra-cmake-modules first time. This step is required to configure KUserFeedback - EXTRA_CMAKE_MODULES_BUILD_CMD = "cmake --build $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH}) --parallel --target install" + EXTRA_CMAKE_MODULES_BUILD_CMD = "cmake --build $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH}) --target install" system("$${EXTRA_CMAKE_MODULES_BUILD_CMD}") # Configure KUserFeedback @@ -138,7 +138,7 @@ QTC_PLUGIN_RECOMMENDS += \ buildextracmakemodules.commands = "$${EXTRA_CMAKE_MODULES_BUILD_CMD}" - buildkuserfeedback.commands = "cmake --build $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) --parallel --target install" + buildkuserfeedback.commands = "cmake --build $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) --target install" buildkuserfeedback.depends = buildextracmakemodules # Force build order. Without this flag Make tries building targets |