Avroid/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-981] qt package (!15)

Browse Source 
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/15
This commit is contained in:
Aleksandr Vodyanov
2025-02-13 12:25:48 +03:00
parent 60445ac09e
commit 3759e1163f
228 changed files with 16106 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
recipes/qt/5.x.x/patches/qttools-1-fixes.patch Normal file
View File

@@ -0,0 +1,94 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 28 Apr 2019 23:07:09 +1000
Subject: [PATCH 1/2] disable windeployqt (MXE specific)
diff --git a/src/src.pro b/src/src.pro
index 1111111..2222222 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -36,7 +36,7 @@ macos {
qtHaveModule(dbus): SUBDIRS += qdbus
-win32|winrt:SUBDIRS += windeployqt
+#win32|winrt:SUBDIRS += windeployqt
winrt:SUBDIRS += winrtrunner
qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 28 Apr 2019 23:12:41 +1000
Subject: [PATCH 2/2] disable qdoc (MXE specific - requires libclang-devel)
diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
deleted file mode 100644
index 1f7544b..0000000
--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+++ /dev/null
@@ -1,41 +0,0 @@
-
-if (NOT TARGET Qt5::qcollectiongenerator)
- add_executable(Qt5::qcollectiongenerator IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qcollectiongenerator PROPERTIES
- IMPORTED_LOCATION ${imported_location}
- )
-endif()
-
-if (NOT TARGET Qt5::qhelpgenerator)
- add_executable(Qt5::qhelpgenerator IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
-!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qhelpgenerator PROPERTIES
- IMPORTED_LOCATION ${imported_location}
- )
-endif()
-
-# Create versionless tool targets.
-foreach(__qt_tool qcollectiongenerator qhelpgenerator)
- if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::${__qt_tool}
- AND TARGET Qt5::${__qt_tool})
- add_executable(Qt::${__qt_tool} IMPORTED)
- get_target_property(__qt_imported_location Qt5::${__qt_tool} IMPORTED_LOCATION)
- set_target_properties(Qt::${__qt_tool}
- PROPERTIES IMPORTED_LOCATION \"${__qt_imported_location}\")
- endif()
-endforeach()
diff --git a/src/src.pro b/src/src.pro
index 1111111..2222222 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -24,9 +24,9 @@ qtConfig(library) {
!android|android_app: SUBDIRS += qtplugininfo
}
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
-QT_FOR_CONFIG += qdoc-private
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
+#include($$OUT_PWD/qdoc/qtqdoc-config.pri)
+#QT_FOR_CONFIG += qdoc-private
+#qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
!android|android_app: SUBDIRS += qtpaths