Qt 5.10.1

ssokov094 · Mar 18, 2018 · fd467a9 · fd467a9
1 parent 50b214b
commit fd467a9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -116,12 +116,14 @@ if(_is_linux OR MINGW)
   # qt-qml example is broken on Linux
   # qt-core example is broken on MinGW
   hunter_config(Qt VERSION 5.5.1-cvpixelbuffer-2-p9)
-else()
+elseif(IOS OR ANDROID)
   hunter_config(Qt VERSION 5.9.1-p0)
+else()
+  hunter_config(Qt VERSION 5.10.1)
 endif()
 
 hunter_config(QtAndroidCMake VERSION 1.0.9)
-hunter_config(QtCMakeExtra VERSION 1.0.28)
+hunter_config(QtCMakeExtra VERSION 1.0.30)
 hunter_config(QtQmlManager VERSION 1.0.0)
 hunter_config(RapidJSON VERSION 1.1.0)
 hunter_config(RapidXML VERSION 1.13)

diff --git a/cmake/projects/Qt/hunter.cmake b/cmake/projects/Qt/hunter.cmake
@@ -227,6 +227,17 @@ hunter_add_version(
     b1bc254e688426316b55115adddd13e4a10115b2
 )
 
+hunter_add_version(
+    PACKAGE_NAME
+    Qt
+    VERSION
+    "5.10.1"
+    URL
+    "http://download.qt.io/official_releases/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz"
+    SHA1
+    3d71e887287bdea664ac6f8db4aaa4a7d913be59
+)
+
 hunter_cacheable(Qt)
 
 if(NOT APPLE AND NOT WIN32)

diff --git a/cmake/projects/QtCMakeExtra/hunter.cmake b/cmake/projects/QtCMakeExtra/hunter.cmake
@@ -316,6 +316,28 @@ hunter_add_version(
     940db41b3200ae6be0a559a2f3c0ba10ebb74e41
 )
 
+hunter_add_version(
+    PACKAGE_NAME
+    QtCMakeExtra
+    VERSION
+    "1.0.29"
+    URL
+    "https://github.com/hunter-packages/QtCMakeExtra/archive/v1.0.29.tar.gz"
+    SHA1
+    e18fc889ffcff5ee14d6d201acc4b7126222f915
+)
+
+hunter_add_version(
+    PACKAGE_NAME
+    QtCMakeExtra
+    VERSION
+    "1.0.30"
+    URL
+    "https://github.com/hunter-packages/QtCMakeExtra/archive/v1.0.30.tar.gz"
+    SHA1
+    5b3df0153d8b64a008ffd1dca192c087b5c6b1a3
+)
+
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(QtCMakeExtra)
 hunter_download(PACKAGE_NAME QtCMakeExtra)