Skip to content

[qtbase] Fix LNK2005 in consumers defining QT_DISABLE_DEPRECATED_BEFORE #50859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
drdanz wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[qtbase] Fix LNK2005 in consumers defining QT_DISABLE_DEPRECATED_BEFORE #50859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/qtbase/fix_removed_api_windows_static.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/cmake/modulecppexports.h.in b/cmake/modulecppexports.h.in
--- a/cmake/modulecppexports.h.in
+++ b/cmake/modulecppexports.h.in
@@ -33,6 +32,10 @@ endif
# define QT_@module_define_infix@_CONSTEXPR_INLINE_SINCE(major, minor) \
QT_IF_DEPRECATED_SINCE(major, minor, constexpr, /* not inline */)
# define QT_@module_define_infix@_INLINE_IMPL_SINCE(major, minor) 1
+#elif !defined(QT_BUILD_@module_define_infix@_LIB) && !defined(QT_BOOTSTRAPPED)
+# define QT_@module_define_infix@_INLINE_SINCE(major, minor)
+# define QT_@module_define_infix@_CONSTEXPR_INLINE_SINCE(major, minor)
+# define QT_@module_define_infix@_INLINE_IMPL_SINCE(major, minor) 0
#else
/* inside library, outside removed_api.cpp:
* keep deprecated API -> non-inline decl, no defi;
1 change: 1 addition & 0 deletions ports/qtbase/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set(${PORT}_PATCHES
fix-libresolv-test.patch
framework.patch
use_inotify_on_freebsd.patch
fix_removed_api_windows_static.patch
)

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand Down
1 change: 1 addition & 0 deletions ports/qtbase/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qtbase",
"version": "6.10.2",
"port-version": 1,
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8274,7 +8274,7 @@
},
"qtbase": {
"baseline": "6.10.2",
"port-version": 0
"port-version": 1
},
"qtcharts": {
"baseline": "6.10.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f26811d213ec3c80cb539868344b47cad84c6f20",
"version": "6.10.2",
"port-version": 1
},
{
"git-tree": "0e931a0ffedd613937a8b9cad29f92087a7f83e8",
"version": "6.10.2",
Expand Down