aboutsummaryrefslogtreecommitdiff
path: root/ports/qtbase/20b3eb0.diff
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-09-30 22:03:56 +0200
committerGitHub <noreply@github.com>2021-09-30 13:03:56 -0700
commit35bfef708400cf882efb3e4df93045e0a06c9c23 (patch)
treef507c664794ece69707f33aef7fc627d96acbed7 /ports/qtbase/20b3eb0.diff
parent8ad33ead9075cd8d6d357e0b870ba8d501efe35c (diff)
downloadvcpkg-35bfef708400cf882efb3e4df93045e0a06c9c23.tar.gz
vcpkg-35bfef708400cf882efb3e4df93045e0a06c9c23.zip
[Qt 6.2] Update Qt6 to 6.2 (#18687)
* [qt6] Update to 6.1.1 * version stuff * fix empty dir * update version * fix casing in qtbase * [libpq] add secure32.lib on windows * add clang-cl fix * version stuff * fix flag removal by adding a space * version stuff * make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q * fix libpq wrapper opensll linkage on linux * use policy to fix dependent ports * version stuff * use upstream patch * version stuff * fix source_location with clang-cl * version stuff * add all new modules * add all modules to the qt port * push all the ports * fix patch * update ports * split qt_install_submodule into smaller functions * add qlitehtml submodule to qttools * update a few ports before moving to beta * update vcpkg.json and refs and fix issue with update * fix dependencies * remove patch * update to 6.2 * add nodejs to vcpkg_find_acquire_program for qtwebengine * format manifest. * fix webengine and see if it builds. * apply format diff * add patch * fix arm builds * fix linux gcc 7.5 build error * fix patch * bump version in qtbase otherwise CI seems to resuse the wrong version * fix webengine release build * try fixing gcc 7.5 build * revert gcc 7.5 fixes since they broke osx * revert gcc 7.5 fixes since they broke osx * fix qtimageformats. * actually enable new qt6 builds. * fix search path for nodejs. * fix the webengine patch again. * fix wrong binary name * revisit all dependencies * revisit webengine features and build settings * more feature stuff * remove qt6betablock and more features review for qt 6.2 * add missing qt prefix. * format manifest * fix ci issues * format manifest. * add node on osx. * install node on linux * fix a typo and a disable another find_package * fix mingw build issues and switch to not using tag * use CMAKE_HOST_WIN32 instead * update ref * fix core configure error * fix mingw case. * fix script installation * remove qmake helper scrpt * delete debug folder if empty * add vcpkg-tool-nodejs * revert changes in the pipeline scripts * adjust qtwebengine to the changes * format manifest and revert doc changes * fix message and logic * fix hashes and make host only port * fix hash again? * qttools add linguist feature for crossbuilds * fix dependency * add thread and future to concurrent feature * add assistant as a required host feature (somebody should tell Qt not to do that) * fix dependency. * [skip ci] not a host dep?!? * [skip ci] debuging * [skip ci] more debug messages * [skip ci] try always redownloading * [skip ci] fix hash und skip hash for redownloading once * [skip ci] comment out skip sha and redownload * add vcpkg_fixup_pkgconfig to libvpx * qtwebengine requires qml and quick * fix manifest format * qtwebengine does not support static builds! * remove unnecessary parts of the patch * update to beta2 * add some " and a message in update mode * [skip ci] remove old and reorder patches * [skip ci] add qtpaths6 * [skip actions] fix webengine patch * [skip actions] fix a few submodule refs * [skip actions] fix qtwebengine * [skip actions] remove qml feature from webengine in qt metaport * qtdeclarative raise minimum cmake version * use the tree id instead? * [skip actions] raise minimum cmake version in qtquick3d * fix fetching of unadvertised commit ids * revert changes to vcpkg_from_git * revert doc changes * [skip actions] use the new FETCH_REF * [skip actiosn] remove raise of minimum version to retry with new cmake version * [skip actions] update to beta3 * revert removal of patch * update to beta4 remove qtquickcontrols2 deps * fix missing \ * [skip actions] fix gstreamer feature on windows * [skip actions] remove outdated patches format qtmultimedia * [skip actions] update to rc1 * [skip actions] remove patch for now * update refs * [skip actions] comment patch to try another patch in qtmultimedia * x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.) * Finalize for 6.2 release. Open issues: QtWebengine and cross builds. * version stuff * fix semver in qtquickcontrols. * version stuff * revise qtwebengine supports expression * update version
Diffstat (limited to 'ports/qtbase/20b3eb0.diff')
-rw-r--r--ports/qtbase/20b3eb0.diff130
1 files changed, 0 insertions, 130 deletions
diff --git a/ports/qtbase/20b3eb0.diff b/ports/qtbase/20b3eb0.diff
deleted file mode 100644
index 978b30ffa..000000000
--- a/ports/qtbase/20b3eb0.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-From 20b3eb0fd8b5f82cf432f2c06e7c5d3f533df0a5 Mon Sep 17 00:00:00 2001
-From: Cristian Adam <cristian.adam@qt.io>
-Date: Thu, 03 Jun 2021 12:42:07 +0200
-Subject: [PATCH] CMake: Add support for building with clang-cl
-
-qmake had support for building with clang-cl as the win32-clang-msvc mkspec.
-
-Task-number: QTBUG-89642
-Task-number: QTBUG-88081
-Change-Id: I0709c289f90fedb121620d1e67ef841602219816
-Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
----
-
-diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
-index bb8b146..792276e 100644
---- a/cmake/QtBuild.cmake
-+++ b/cmake/QtBuild.cmake
-@@ -285,7 +285,9 @@
- list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64)
- endif()
- if(MSVC)
-- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-+ if (CLANG)
-+ set(QT_DEFAULT_MKSPEC win32-clang-msvc)
-+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
- set(QT_DEFAULT_MKSPEC win32-arm64-msvc)
- else()
- set(QT_DEFAULT_MKSPEC win32-msvc)
-diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
-index 0c57d9e..0eeccce 100644
---- a/cmake/QtFlagHandlingHelpers.cmake
-+++ b/cmake/QtFlagHandlingHelpers.cmake
-@@ -235,7 +235,7 @@
- function(qt_set_msvc_cplusplus_options target visibility)
- # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus.
- # Check qt_config_compile_test for more info.
-- if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913)
-+ if(MSVC AND MSVC_VERSION GREATER_EQUAL 1913)
- target_compile_options("${target}" ${visibility} "-Zc:__cplusplus" "-permissive-")
- endif()
- endfunction()
-diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
-index 2c991f7..9f0c95e 100644
---- a/src/corelib/CMakeLists.txt
-+++ b/src/corelib/CMakeLists.txt
-@@ -263,4 +263,24 @@
- # special case end
- )
-
-+if (MSVC AND CLANG)
-+ foreach(subarch sse4_1 rdrnd rdseed)
-+ if (TEST_subarch_${subarch})
-+ qt_internal_add_simd_part(Core SIMD ${subarch}
-+ SOURCES
-+ global/qsimd.cpp
-+ )
-+ endif()
-+ endforeach()
-+
-+ foreach(subarch sse4_1 aesni)
-+ if (TEST_subarch_${subarch})
-+ qt_internal_add_simd_part(Core SIMD ${subarch}
-+ SOURCES
-+ tools/qhash.cpp
-+ )
-+ endif()
-+ endforeach()
-+endif()
-+
- # special case begin
-diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
-index 5869751..6108b07 100644
---- a/src/corelib/global/qt_pch.h
-+++ b/src/corelib/global/qt_pch.h
-@@ -62,17 +62,22 @@
- # define _POSIX_
- # include <limits.h>
- # undef _POSIX_
--#endif
--#include <qcoreapplication.h>
--#include <qcoreevent.h>
--#include <qiodevice.h>
--#include <qlist.h>
--#include <qvariant.h> /* All moc genereated code has this include */
--#include <qobject.h>
--#include <qregularexpression.h>
--#include <qscopedpointer.h>
--#include <qshareddata.h>
--#include <qstring.h>
--#include <qstringlist.h>
--#include <qtimer.h>
-+# if defined(Q_CC_CLANG) && defined(Q_CC_MSVC)
-+// See https://bugs.llvm.org/show_bug.cgi?id=41226
-+# include <wchar.h>
-+__declspec(selectany) auto *__wmemchr_symbol_loader_value = wmemchr(L"", L'0', 0);
-+# endif
-+# endif
-+# include <qcoreapplication.h>
-+# include <qcoreevent.h>
-+# include <qiodevice.h>
-+# include <qlist.h>
-+# include <qvariant.h> /* All moc genereated code has this include */
-+# include <qobject.h>
-+# include <qregularexpression.h>
-+# include <qscopedpointer.h>
-+# include <qshareddata.h>
-+# include <qstring.h>
-+# include <qstringlist.h>
-+# include <qtimer.h>
- #endif
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 5fe4d59..04f58dd 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -577,6 +577,15 @@
- )
- endif()
-
-+ if (MSVC AND CLANG AND TEST_subarch_sse4_1)
-+ qt_internal_add_simd_part(Gui SIMD sse4_1
-+ SOURCES
-+ painting/qdrawhelper.cpp
-+ painting/qdrawhelper_sse2.cpp
-+ painting/qdrawhelper_ssse3.cpp
-+ )
-+ endif()
-+
- qt_internal_add_simd_part(Gui SIMD ssse3
- SOURCES
- image/qimage_ssse3.cpp