5f5724d2a8
* sync mingw-w64-qt5-static with mingw-w64-qt5
* mingw-w64-qt5{,-static} fixes (#2830)
skip examples for static builds (> 100 GiB, and was also done so before)
no need for the same docs in qt5-static
rename the build folder in prepare() and not in build()
remove orphan qt-5.3.0-static-qmake-conf.patch (duplicate of 0007-qt-5.3.0-win32-g-Enable-static-builds.patch)
workarounds for #1942
patch in package() to enable Qml static plugins
remove CMake config for QVirtualKeyboardPlugin because it still doesn’t work
19 lines
527 B
Diff
19 lines
527 B
Diff
--- qt5-static/lib/cmake/Qt5Qml/Qt5QmlConfig.cmake 2017-02-20 11:57:02.000000000 +0000
|
|
+++ qt-patch/Qt5QmlConfig.cmake 2017-07-19 20:32:57.570795900 +0000
|
|
@@ -209,6 +209,7 @@
|
|
endforeach()
|
|
endif()
|
|
|
|
+ include("${CMAKE_CURRENT_LIST_DIR}/Qt5QmlConfigExtras.cmake")
|
|
_populate_Qml_target_properties(RELEASE "libQt5Qml.a" "" )
|
|
|
|
|
|
@@ -218,7 +219,6 @@
|
|
|
|
|
|
|
|
- include("${CMAKE_CURRENT_LIST_DIR}/Qt5QmlConfigExtras.cmake")
|
|
|
|
|
|
_qt5_Qml_check_file_exists("${CMAKE_CURRENT_LIST_DIR}/Qt5QmlConfigVersion.cmake")
|