Skip to content

Instantly share code, notes, and snippets.

Avatar

Tor Arne Vestbø torarnv

  • The Qt Company
  • Oslo, Norway
View GitHub Profile
View stdin.patch
diff --git i/mkspecs/features/data/mac/objc_namespace.sh w/mkspecs/features/data/mac/objc_namespace.sh
index ceff2df324c..2d6585c8b7d 100755
--- i/mkspecs/features/data/mac/objc_namespace.sh
+++ w/mkspecs/features/data/mac/objc_namespace.sh
@@ -129,6 +129,11 @@ inspect_binary() {
classnames_section="__objc_classname"
classnames=$(otool -v -s __TEXT $classnames_section "$target" | tail -n +3)
+ if [ -z "$classnames" ]; then
+ echo "no Objective-C classes in binary."
View stdin.patch
clearbinds
bind f1 consoletoggle
bind w +forward
bind s +backward
bind a +left
bind d +right
bind mouse0 +attack
bind mouse1 +attack2
bind mouse2 +attack3
bind 1 +slot1
View stdin.patch
diff --git i/cmake/QtBaseGlobalTargets.cmake w/cmake/QtBaseGlobalTargets.cmake
index b6efee7ad6a..73bc83aca08 100644
--- i/cmake/QtBaseGlobalTargets.cmake
+++ w/cmake/QtBaseGlobalTargets.cmake
@@ -209,7 +209,6 @@ qt_copy_or_install(FILES
cmake/QtSeparateDebugInfo.cmake
cmake/QtSetup.cmake
cmake/QtSimdHelpers.cmake
- cmake/QtStartupHelpers.cmake
cmake/QtStandaloneTestsConfig.cmake.in
View stdin.patch
diff --git i/src/CMakeLists.txt w/src/CMakeLists.txt
index aa4b1b06c46..bf71322b44c 100644
--- i/src/CMakeLists.txt
+++ w/src/CMakeLists.txt
@@ -26,6 +26,8 @@ endfunction()
find_or_build_bootstrap_names()
+add_subdirectory(entrypoint)
+
View stdin.patch
diff --git i/src/corelib/Qt6CoreMacros.cmake w/src/corelib/Qt6CoreMacros.cmake
index 0745c60c2d4..4fc9106fc75 100644
--- i/src/corelib/Qt6CoreMacros.cmake
+++ w/src/corelib/Qt6CoreMacros.cmake
@@ -1368,6 +1368,11 @@ function(_qt_internal_setup_startup_target)
set(dependent_target "${dependent_aliased_target}")
endif()
+ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "iOS" OR APPLE)
+ target_link_libraries("${dependent_target}" INTERFACE Qt6::EntryPoint)
View stdin.patch
diff --git c/cmake/QtModuleHelpers.cmake i/cmake/QtModuleHelpers.cmake
index a628ac923d1..aab9a8a2a94 100644
--- c/cmake/QtModuleHelpers.cmake
+++ i/cmake/QtModuleHelpers.cmake
@@ -199,6 +199,10 @@ function(qt_internal_add_module target)
set_property(TARGET "${target}" PROPERTY MODULE_HEADER "${module_include_dir}/${module_include_name}")
endif()
+ set_target_properties(${target} PROPERTIES
+ _qt_public_header_destination "PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module_include_name}"
View stdin.patch
diff --git c/cmake/QtModuleHelpers.cmake i/cmake/QtModuleHelpers.cmake
index a628ac923d1..830b7760f9b 100644
--- c/cmake/QtModuleHelpers.cmake
+++ i/cmake/QtModuleHelpers.cmake
@@ -199,6 +199,10 @@ function(qt_internal_add_module target)
set_property(TARGET "${target}" PROPERTY MODULE_HEADER "${module_include_dir}/${module_include_name}")
endif()
+ set_target_properties(${target} PROPERTIES
+ _qt_public_header_destination "${INSTALL_INCLUDEDIR}/${module_include_name}"
View stdin.patch
diff --git i/cmake/QtModuleHelpers.cmake w/cmake/QtModuleHelpers.cmake
index a628ac923d1..6cc735236be 100644
--- i/cmake/QtModuleHelpers.cmake
+++ w/cmake/QtModuleHelpers.cmake
@@ -510,20 +510,6 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
)
file(COPY ${extra_cmake_files} DESTINATION "${config_build_dir}")
- set(exported_targets ${target})
- if(NOT ${arg_NO_PRIVATE_MODULE})
View stdin.patch
diff --git i/src/entrypoint/CMakeLists.txt w/src/entrypoint/CMakeLists.txt
index 67b3977065e..a5981d2059b 100644
--- i/src/entrypoint/CMakeLists.txt
+++ w/src/entrypoint/CMakeLists.txt
@@ -106,6 +106,15 @@ if(using_entrypoint_library)
set(export_name "${INSTALL_CMAKE_NAMESPACE}EntryPointTargets")
qt_install(TARGETS EntryPointImplementation EXPORT ${export_name})
qt_generate_prl_file(EntryPointImplementation "${INSTALL_LIBDIR}")
+
+ set(install_prefix "${INSTALL_CMAKE_NAMESPACE}EntryPoint")
View stdin.patch
diff --git i/cmake/QtPostProcessHelpers.cmake w/cmake/QtPostProcessHelpers.cmake
index 52858af28c7..655739e80c1 100644
--- i/cmake/QtPostProcessHelpers.cmake
+++ w/cmake/QtPostProcessHelpers.cmake
@@ -129,8 +129,8 @@ function(qt_internal_create_module_depends_file target)
set(all_depends ${depends} ${public_depends})
foreach (dep ${all_depends})
# Normalize module by stripping leading "Qt::" and trailing "Private"
- if (dep MATCHES "Qt::([A-Za-z0-9]+)")
- set(dep "${CMAKE_MATCH_1}")