projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b5a636
)
Remove QtConcurrent from component list for Qt4.
author
Klaas Freitag
<freitag@owncloud.com>
Wed, 20 May 2015 15:00:27 +0000
(17:00 +0200)
committer
Klaas Freitag
<freitag@owncloud.com>
Wed, 20 May 2015 15:00:27 +0000
(17:00 +0200)
According to Olivier QtConcurrent was part of QtCore in Qt4.
cmake/modules/QtVersionAbstraction.cmake
patch
|
blob
|
history
diff --git
a/cmake/modules/QtVersionAbstraction.cmake
b/cmake/modules/QtVersionAbstraction.cmake
index 84402bb03105e72f34bbeff9a7c0359db2866fb4..760e9ed3a3ade1be91d71efbc99bddfc41f6f571 100644
(file)
--- a/
cmake/modules/QtVersionAbstraction.cmake
+++ b/
cmake/modules/QtVersionAbstraction.cmake
@@
-112,7
+112,7
@@
endif( Qt5Core_FOUND )
if(NOT Qt5Core_FOUND)
message(STATUS "Could not find Qt5, searching for Qt4 instead...")
- set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit"
"QtConcurrent"
)
+ set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit")
if( BUILD_TESTS )
list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
endif()