Commit Graph

8032 Commits

Author SHA1 Message Date
Marco Bubke
8b7762621b QmlDesigner: Change model creation to new code model
The model needs the project store, the path cache, the imports and the
file path. So we now use a method in the model to copy them over to the
new model.

Task-number: QDS-12102
Change-Id: I80f911d55c5a5fdf9d1a87c1f4888e498086374b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 11:23:33 +00:00
Marco Bubke
6ebb7923b2 QmlDesigner: Deprecate optionally old node meta info API
If the project storage is activated the old API will be deprecated.
Hepefully people now stop to use the old API. You can still use it but
you have to write an implementation for the new one too.

Task-number: QDS-12102
Change-Id: Iac23da1648ff44e27a2ee7840e0d3eeb1fb8caf9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-11 11:23:27 +00:00
Robert Löhning
7813ce9335 SquishTests: Avoid warnings when reading build issues
tst_APTW01 explicitly disables the Clang Code Model
so there is no filter category of that name.

Change-Id: I7378e11582bb0231a24404cca212a234ef7f37ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 09:13:51 +00:00
Christian Kandeler
2524e2adb3 CppEditor: Let users provide statement macros
Like ClangFormat has.

Fixes: QTCREATORBUG-15069
Fixes: QTCREATORBUG-18789
Change-Id: I0ffb70be502d1c73aaaf436484ddc6704f152621
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-07 13:45:31 +00:00
Robert Löhning
43b54e8c3a SquishTests: Update button type in Welcome mode
Amends 9832af9701

Change-Id: I8840748e3bcb2c0993f93411b324e04a7f81960d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-07 11:12:28 +00:00
Robert Löhning
498625520a SquishTests: Don't try removing packages directories
Seems they are not being created anymore.

Change-Id: I8b48a848793fb73ea193918c14c322d6166b2053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-07 11:12:04 +00:00
Eike Ziller
8abc95331f Merge remote-tracking branch 'origin/13.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/cppeditor/cppcodemodelsettings.cpp
	src/plugins/cppeditor/cppcodemodelsettings.h

Change-Id: I54937c39b06897a72a105e4e0a8b5f8a76c38e26
2024-03-06 15:10:15 +01:00
Christian Kandeler
1badc9f4a8 ClangFormat: Do not align parameters/arguments with the function name
The previous setting
    - wastes space, leading to problems when both the function name
      and the parameter (or, more likely, the argument expression)
      are long-ish.
    - necessitates re-formatting of the entire argument/parameter list
      on function renaming.

Change-Id: Ica82e284f9a5a8f2cf244938996039a59ce0b3aa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-06 10:20:25 +00:00
Eike Ziller
c4e8963d8d Remove unneeded version checks
After we raised the minimum Qt version.

Change-Id: Ife81a25c3c205646eece30d6dd1a95f4b97eda01
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-04 14:16:15 +00:00
Robert Löhning
c5cce4233d SquishTests: Update tests for Welcome screen
Some tests are failing because of QTCREATORBUG-30466
unless someone resizes Creator's windows manually.

Task-number: QTCREATORBUG-30466
Change-Id: Ibeecc2abd85839be3497691912e411862c465a89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-01 13:26:11 +00:00
Tim Jenssen
56c4ba1db4 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I1d328f67a1c538e36a54f9660d5fb2840a6753df
2024-02-29 19:40:30 +01:00
Eike Ziller
6c2df76737 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Ifcb16aa16c7bc2792de25d0ee7a22cf0e39a05f8
2024-02-29 12:44:58 +01:00
Eike Ziller
5af531cd39 Utils: Fix build with MSVC with C++20
Rename process.h back to qtcprocess.h

MSVC's "threads" standard header includes <process.h>, and that ends up
including our process.h from Utils.

There already was a hacky workaround in place for a similar issue with
MINGW, but that doesn't work with MSVC because that doesn't have

Simply use a name that doesn't conflict.

Change-Id: I1159cd2096b4f2dbc4a1728d0131dd6edd30ebd3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-28 08:09:05 +00:00
Alessandro Portale
903d01b934 Welcome: Implement new design
2024 redesign

Change-Id: I6629849921272d856f201693973a8e29c6465e94
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-02-27 16:42:10 +00:00
Eike Ziller
a8414effd8 Merge remote-tracking branch 'origin/13.0'
Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a
2024-02-27 09:04:51 +01:00
Christian Kandeler
e43fde322e CppEditor: Fix indentation of function call arguments
... following an argument with an array subscript operator.

Fixes: QTCREATORBUG-29225
Change-Id: Iba38043d94be718efee30ce50f5b55aac4ba6ecd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-26 14:53:24 +00:00
Christian Kandeler
c0bbf285a7 CppEditor: Fix indentation with inline namespaces
After encountering the namespace keyword, we have to backtrack the state
change introduced by the inline keyword.

Fixes: QTCREATORBUG-22071
Change-Id: I543976622d1a56b2c61d68da6ec3eee8b6d0d5b3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-23 13:46:04 +00:00
Jarek Kobus
55c12d022c Expected: Add a test ensuring the default c'tor has value
When docs aren't easily available, let's have a test for it.

Change-Id: Ic9cec669cc93a38e79b68ddec7cfcc5bccae5de5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-23 07:55:23 +00:00
hjk
e678da9934 Require C++20
Change-Id: Id6581a4c32ec6411195edb51339f017e4ddb51ff
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-22 11:22:09 +00:00
Christian Stenger
32cad6d389 Tests: Fix build with Qt6.2
Amends d672908608.

Change-Id: Ie80c69ecb1e96a5c86800e8f431f01f6ed611e6d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-02-22 06:49:16 +00:00
Jarek Kobus
d672908608 TaskTree: Add info about sync/async execution into withLog()
Add tests for it.

This addresses the 35th point in the bugreport below.

Task-number: QTCREATORBUG-28741
Change-Id: Id35d51155e0bfd413c06b3a2c5bb57b8bcea8487
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-21 16:30:16 +00:00
Jarek Kobus
d4b5a1efda TaskTree: Check the right asyncCount() in tests
This is quite crucial test checking the right internal behavior.
The expected asyncCount numbers were added to these tests after
processing each recipe by hand and deducing the expected scenario
and the number of times each recipe should return the control to
the main event loop before the task tree finished.

Be very careful when correcting any of these numbers - this might
mean the internal change inside the task tree forcing the asyncCount
adjustment may break the task tree architecture.

Change-Id: Ia3acfbf3cb232ed95df97fe5822305df98e2271a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-21 06:51:31 +00:00
Jarek Kobus
5c8b87bf9d TaskTree: Simplify some test code
Change-Id: Id81969d00a6e183e0d7cdcfddc64fc65aab6e020
Reviewed-by: hjk <hjk@qt.io>
2024-02-21 06:48:18 +00:00
Marco Bubke
d68ad36ce1 QmlDesigner: Fix clang format file
The regular expression was case insensitive.

Change-Id: Ic44ac8b65428574fb7d0cb8327b8b536b74720d8
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-02-20 17:02:55 +00:00
Christian Kandeler
e930b29d66 CppEditor: Do not access document manager when gathering local symbols
As it turns out, that code runs in a dedicated thread.

Task-number: QTCREATORBUG-30401
Change-Id: I66236fa00b8ddb55276d822357517fdccb0e61df
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-20 16:04:22 +00:00
Jarek Kobus
62a203c926 TaskTree: Add tests for withLog() function
This addresses the 7th and 8th points in the bugreport below.

Task-number: QTCREATORBUG-28741
Change-Id: I5fe09227c1118e66c38bbe98ef720b21823c28ed
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-20 12:24:56 +00:00
Christian Kandeler
6561d3f691 Update clang-format test file
... such that it represents the output from a current clang-format with
our current settings.

Change-Id: I0bc75c80b01e991c10bc490f4dc0270b8292fae3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-20 10:55:02 +00:00
Christian Stenger
7261c2889c Tests: Fix missing include
Avoids a compile issue before being able to execute the test.

Change-Id: Ibc76c16229107e2c23757de682bc78bfe4b7d6e7
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-02-20 10:40:28 +00:00
Michael Weghorn
84f4fb0818 Debugger: Fix building custom allocator dumper tests for MSVC
3b5c377ce5 had fixed them
for GCC >= 13, but unfortunately made them no longer
compile on Windows with MSVC as reported in the Gerrit
change, error below.

Align the implementation of the custom allocator
more with the "23_containers/vector/52591.cc" [1] ones
referred to in the GCC commit [2], in particular
define ctors, so this compiles with both GCC on Linux
and MSVC on Windows.

Move the definition of that custom allocator
to a new macro "MY_ALLOCATOR" to avoid duplication.

Previous error with MSVC:

    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): error C2440: 'static_cast': cannot convert from 'myallocator<char>' to 'myallocator<_Tp1>'
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): note: 'myallocator<_Tp1>::myallocator': no overloaded function could convert all the argument types
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Users\davschul\Downloads\Archive\main.cpp(8): note: could be 'myallocator<_Tp1>::myallocator(myallocator<_Tp1> &&)'
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): note: 'myallocator<_Tp1>::myallocator(myallocator<_Tp1> &&)': cannot convert argument 1 from 'myallocator<char>' to 'myallocator<_Tp1> &&'
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): note: Reason: cannot convert from 'myallocator<char>' to 'myallocator<_Tp1>'
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called
    C:\Users\davschul\Downloads\Archive\main.cpp(8): note: or       'myallocator<_Tp1>::myallocator(const myallocator<_Tp1> &)'
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): note: 'myallocator<_Tp1>::myallocator(const myallocator<_Tp1> &)': cannot convert argument 1 from 'myallocator<char>' to 'const myallocator<_Tp1> &'
            with
            [
                _Tp1=std::_Container_proxy
            ]
    C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.38.33130\include\xstring(3141): note: Reason: cannot convert from 'myallocator<char>' to 'const myallocator<_Tp1>'
            with
            [
                _Tp1=std::_Container_proxy
            ]

[1] https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=libstdc%2B%2B-v3/testsuite/23_containers/vector/52591.cc;h=ea80bb277c1f49190ae21b64e738428066eba1e0;hb=64c986b49558a7
[2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=64c986b49558a7

Change-Id: I13a3ed226a411479ea1d24a2eda490c8f293bf8f
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-19 23:03:58 +00:00
Robert Löhning
b508d2e959 SquishTests: Remove one iteration loop
Qt Quick Application projects only allow CMake.

Change-Id: I27ee545a572eadcf98e1ec8188a0d77a9872aa14
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-19 22:54:50 +00:00
Eike Ziller
8826a8b47b Merge remote-tracking branch 'origin/13.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I2a3d92a14e4dd16897d19f7d8a8c7b0ec30d14a5
2024-02-19 14:44:54 +01:00
Robert Löhning
cfb26a06a7 SquishTests: Improve toggling filter names in "Issues" view
- Explicitly set a shorter timeout. After the menu appears, it
  should not take that long until the item is there, too.

- Warn when an item can't be found. This should not go unnoticed,
  because it either means that the GUI changed or that there's a
  bug in the test. Both require a fix.

Change-Id: Id7faa2b91926c392bd0d894214f498d8ba8edaa1
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-19 11:25:48 +00:00
Robert Löhning
c4abbef0a8 SquishTests: Stabilize adding documentation
I noticed that Creator built on Qt 6.6.0 never needed longer than
two seconds to update the documentation after adding qtcreator.qch.
The same sources of Creator built on Qt 6.6.2 needed up to four
seconds. This subtle difference can lead to the situation that the
documentation was not yet updated when clicking "Getting Started"
in tst_WELP01, which then just displays an empty page.

Change-Id: I11ab2a902825190ed8ae27dad55a847f01ba44dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-19 11:20:26 +00:00
Cristian Adam
d13a7dc9b5 CMakePM: Update cmake conan for auto-setup
Update to https://github.com/conan-io/cmake-conan/commit/
f6464d1e13ef7a47c569f5061f9607ea63339d39

Task-number: QTCREATORBUG-30169
Change-Id: Ibb8f3d353117c5c8ce21b8686cb6e2e5ee146698
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-19 08:30:47 +00:00
Jarek Kobus
36241b4462 TaskTree: Add global nullItem
This might be useful when using conditional operator.
Might also be used in place of the default c'tor for GroupItem.

Add a test for it.

Change-Id: I622e5d3d94f7020dc294cf5bca643c53a0813d8a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-16 06:21:53 +00:00
Marco Bubke
4b0ea7b8fd QmlDesigner: Make model nodes invalid on model deletion
Change-Id: I37fabba902ed2a6cd0940abeb63606e335bb76ab
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-15 13:54:48 +00:00
Marco Bubke
7a73b7a6b1 Remove entries with default value
Change-Id: I1f78c85a5a8d2a6e22d7bc3537ecb13018f4a661
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-02-15 13:37:19 +00:00
Eike Ziller
10a97be988 Merge remote-tracking branch 'origin/13.0'
Change-Id: I923d0054e306528825e1b36f9f24c378b151d85a
2024-02-15 11:30:32 +01:00
Jarek Kobus
0b3b5b892c TaskTree: Add a test for progress reporting with onGroupSetup(false)
Also for the case when parent iteration isn't progressive.

Change-Id: I831b86de68d504a1e5e189d2be2b12ffc7d97c60
Reviewed-by: hjk <hjk@qt.io>
2024-02-15 10:09:19 +00:00
Jarek Kobus
02ac5deb4a TaskTree: Fix progress reporting with nested LoopUntil(false)
Fix also a case when parent iteration isn't progressive.
Add a test for it.

Amends e059b62421

Change-Id: Ic2f8c047d413ab2e2b98af4592f7cb60185bea06
Reviewed-by: hjk <hjk@qt.io>
2024-02-15 10:08:49 +00:00
The Qt Project
10e2ff5362 Merge "Merge remote-tracking branch 'origin/13.0'" 2024-02-15 07:00:47 +00:00
Jarek Kobus
e059b62421 TaskTree: Fix progress reporting with LoopUntil(false)
Advance the progress value by the group's children count when
LoopUntil handler returns false on the first iteration.

Add a test for it.

Change-Id: I3783dd295dfaa16c09c5eda299f365ff981b3be7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2024-02-15 06:42:07 +00:00
Marcus Tillmanns
b39b192518 ExtensionSystem: Refactor PluginSpec
Splits the functionality between plugin type specific and general.

Allows Plugins to be loaded after the first pass, e.g. for Lua scripted
plugins.

Change-Id: If2712817a672c49d554fdc308250cb06ca7eb3f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-14 14:33:16 +00:00
Eike Ziller
bcf0d8c319 Merge remote-tracking branch 'origin/13.0'
Change-Id: Iaf7373d449668bba57e53810858b58e2ec83dcc0
2024-02-14 12:48:53 +01:00
hjk
0a1783d656 Utils: Rename NameValueItem to EnvironmentItem (1/2)
Only used in Environments nowadays.

Change-Id: I64a645ebebd5cb57c50d5d8f72a5e4dba40e122f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-14 11:33:53 +00:00
Tim Jenssen
adcac7cb6b Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I242c01e82fc1b0db1f5e88c35d526f91dd022337
2024-02-13 14:33:35 +01:00
Michael Weghorn
4aaf7f2689 Debugger: Add debugging helper for std::tuple
Add debugging helper for std::tuple and add
a corresponding dumper test for it.

With this in place, the std::tuple variable and its elements
in the "tuple.cpp" sample program from QTCREATORBUG-25865 are
shown as expected on both, Linux (libstdc++) with GDB or LLDB and with
an MSVC build with CDB on Windows.

A debugging helper for libc++ had already been added in commit
34ff9c97e6.

Task-number: QTCREATORBUG-25865
Change-Id: I24b3d36b5daa26fd4fcb073c4df79015dfe752fc
Reviewed-by: hjk <hjk@qt.io>
2024-02-12 11:55:18 +00:00
Christian Stenger
35b7f868f5 SquishTests: Remove firewall handling for Windows
Handling the firewall from script is cumbersome and not worth the
effort - remove all related code.
Explicitly state the prerequisite of disabling notifications for the
firewall.

Change-Id: Icbe3075127eeb9a57724c334f0b52a24f8b08f59
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
2024-02-12 05:53:14 +00:00
Christian Stenger
e1f6ee8f76 SquishTests: Do not wait for the BuildProgress
We always fail to retrieve it nowadays, so just remove this.

Change-Id: I616e40e22ed1da2782b766701ba4b5bd742e1133
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Jukka Nokso <jukka.nokso@qt.io>
2024-02-12 05:53:01 +00:00
Michael Weghorn
3b5c377ce5 Debugger: Fix custom allocator dumper tests for GCC >= 13
GCC commit [1]

    commit 64c986b49558a7c356b85bda85195216936c29a3
    Author: Jonathan Wakely <jwakely@redhat.com>
    Date:   Wed Dec 14 15:21:32 2022 +0000

        libstdc++: Diagnose broken allocator rebind members

added a static_assert that caused the dumper tests using custom
allocators to fail like this on Debian testing:

    DEBUG : tst_Dumpers::dumper(StdBasicString) qtc.debugger.dumpers: In file included from /usr/include/c++/13/ext/alloc_traits.h:34,
                     from /usr/include/c++/13/bits/basic_string.h:39,
                     from /usr/include/c++/13/string:54,
                     from main.cpp:28:
    /usr/include/c++/13/bits/alloc_traits.h: In instantiation of ‘struct std::__allocator_traits_base::__rebind<myallocator<char>, char, void>’:
    /usr/include/c++/13/bits/alloc_traits.h:94:11:   required by substitution of ‘template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = myallocator<char>; _Up = char]’
    /usr/include/c++/13/bits/alloc_traits.h:228:8:   required by substitution of ‘template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = char; _Alloc = myallocator<char>]’
    /usr/include/c++/13/ext/alloc_traits.h:126:65:   required from ‘struct __gnu_cxx::__alloc_traits<myallocator<char>, char>::rebind<char>’
    /usr/include/c++/13/bits/basic_string.h:90:24:   required from ‘class std::__cxx11::basic_string<char, std::char_traits<char>, myallocator<char> >’
    main.cpp:56:71:   required from here
    /usr/include/c++/13/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
       70 |                         _Tp>::value,
          |                               ^~~~~
    /usr/include/c++/13/bits/alloc_traits.h:70:31: note: ‘std::integral_constant<bool, false>::value’ evaluates to false
    make: *** [Makefile:506: main.o] Error 1

Override the rebind behavior of the custom allocator used
in the tests to fix this.

[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=64c986b49558a7

Change-Id: I1cd8370e5f1601b710e28c251061291c65ac44ce
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-09 19:50:26 +00:00