Commit Graph

10337 Commits

Author SHA1 Message Date
Leander Beernaert
5e44dc8864 Fix qnetworksession test
Change-Id: I8d549b571dea8c0b275a6c220dd58f1644ebc443
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-10 14:59:50 +00:00
Leander Beernaert
26600a069a Fix tst_qdbusmarshall
Change-Id: Ia7bb50a8c69a0083d0b8acdad0cb8eb6a71ca24e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-10 13:01:21 +00:00
Leander Beernaert
f4a630588f Fix tst_qlogging
Pass in the QT_CMAKE_BUILD define to change the expected executable name
in the tests.

Add special cases for missing compile flags that cause the collection of
backtraces to fail otherwise.

Change-Id: I53c44f7e4c6d597f941e4dd8173b3a39a615339c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-10 10:20:31 +00:00
Jean-Michaël Celerier
ea81b69cde Implement qtbase fixes for superbuilds
Change-Id: I0d3445cf0740e3925fa9342dac4d07892518afe5
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-08 10:42:21 +00:00
Alexandru Croitor
aa1f970c43 Fix qmake builds of socket tests
qabstractsocketengine.cpp was changed to explicitly include its header
moc file, which works with AUTOMOC, but doesn't with qmake.
The header file needs to be explicitly listed in the HEADERS variable.

Amends 2a1fc7b835.

Change-Id: I9d31288d1f1eb2310679a7e685bd7ea458a77920
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-12-19 09:21:15 +00:00
Alexandru Croitor
4dfb1eca1e Fix qmake builds
We did some changes in the .cpp files of some tests when converting
the build system to CMake, but didn't adjust the .pro files which
caused tests to fail when doing a qmake build.

Make the required changes. Was discovered when doing a test
wip/cmake -> dev merge.

Change-Id: I407a982412cb44df592a38a4cb997968bdfe3304
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-12-11 20:57:54 +00:00
Alexandru Croitor
55a15a1c1b Add initial support for cross-building to iOS
Tested locally with the following configurations:
- iOS device builds (arm64)
- iOS simulator builds (x86_64)
- iOS simulator_and_device builds (fat arm64 and x86_64 archives)

All iOS builds currently require a custom vcpkg fork which contains
fixes for building the required 3rd party libraries.

qtsvg, qtdeclarative, qtgraphicaleffects and qtquickcontrols2
have also been tested to build successfully.

simulator_and_device builds are also supported, but require an umerged
patch in upstream CMake as well as further patches to vcpkg.

Task-number: QTBUG-75576
Change-Id: Icd29913fbbd52a60e07ea5253fd9c7af7f8ce44c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2019-12-03 13:35:59 +00:00
Leander Beernaert
1c655fb0fc Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-25 14:53:27 +00:00
Leander Beernaert
26e8769124 Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
2019-11-19 13:53:21 +01:00
Leander Beernaert
47428dfa55 Convert all of tests/manual
Fixes: QTBUG-78164
Change-Id: I28b59bf84533fc33fafafd1511b5337d36af0e2b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-14 09:03:26 +00:00
Leander Beernaert
0ca41ee2aa Fix build for tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject
Change-Id: I9c793e38b89cc00c8835bdcf85e9ab0b714da1c8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-13 14:01:38 +00:00
Leander Beernaert
bac999f38c Fix two manual tests qmake project files
Fixes incorrect target name for styles test.

Explicit reference of widgets and opengl libraries in dialog.pri. While
not necessary for qmake it makes our lives easier when running the
CMake conversion script.

Change-Id: I036cae9d801c80c5817421b8427fc5c91e2f7883
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-13 15:00:58 +01:00
Leander Beernaert
15b78b3b54 Update version checks in tests/manual
Remove unnecessary version in tests/manual since they are always true in
the CMake port where it's impossible to have a QtVersion less than 6.0.

Change-Id: I26a13117a8c2e032a9cc70ca0f040122cbf79886
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-13 15:00:51 +01:00
Alexandru Croitor
5c28fce38e Regenerate qtbase tests and src/* for some small fixes
Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 13:36:09 +00:00
Alexandru Croitor
71c43b035b Regenerate tests/auto/testlib
Change-Id: If1b2e105836b73b1a68ed5a8e11feb8e114d66e2
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 13:36:00 +00:00
Alexandru Croitor
0d43af1281 Regenerate tests/auto/sql
Change-Id: If411b1e7c3a7cb58922e5a48309f42ba29f2c068
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:12:32 +00:00
Alexandru Croitor
47ce9e5a78 Regenerate tests/auto/printsupport
Change-Id: I517adae77f7a5851b07fa660732318c175570fb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:12:23 +00:00
Alexandru Croitor
6d29435568 Regenerate tests/auto/other
Change-Id: Ib1753d1869f5af1900fbeaf2e95d3160cf979ca8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:12:04 +00:00
Alexandru Croitor
36abcc7cbe Regenerate tests/auto/opengl
Change-Id: I9bd417ae02db1b6827e09baab301152f3614da80
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:11:48 +00:00
Alexandru Croitor
8305b6fe3f Regenerate tests/auto/dbus
Change-Id: I105eb73065e02a4fa508d17f481047b32875f128
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:11:39 +00:00
Alexandru Croitor
0650bafa59 Regenerate tests/auto/concurrent
Change-Id: I6a291f7dd70f78c5cafb6d96a1c0d57ed7223c8b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:59 +00:00
Alexandru Croitor
0d62567f0b Regenerate tests/auto/network/ssl
Change-Id: Ib05f4e3c8dea934ce48776fdd50305f7c98c1adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:48 +00:00
Alexandru Croitor
164d8c35b3 Regenerate tests/auto/network/socket
Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:36 +00:00
Alexandru Croitor
ee5db96ef7 Regenerate tests/auto/network/bearer
Change-Id: I57526fa99376708203fb1723f3b85243925a1273
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:24 +00:00
Alexandru Croitor
5acc32361e Regenerate tests/auto/network/access
Change-Id: I18839ef583336fa2fa42cb4325fdb007675df213
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:12 +00:00
Alexandru Croitor
dec6b7cb9e Regenerate tests/auto/network/kernel
Change-Id: I770fce0f0a369204178ea0dfa7bbd8b210dd3585
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:02 +00:00
Alexandru Croitor
3909923958 Regenerate tests/auto/widgets/util
Change-Id: Icda122f04c8857f237e822d3981befb78885309b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:52 +00:00
Alexandru Croitor
af72e13636 Regenerate tests/auto/widgets/graphicsview
Change-Id: I2e6a8f2f92e9cb8d6bb0be53068dfd43ba87db4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:43 +00:00
Alexandru Croitor
3f5adb4653 Regenerate tests/auto/widgets/itemviews
Change-Id: Ia95c89cde7faf5d3edb69cc8969bda2becd7b51d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:34 +00:00
Alexandru Croitor
5c549fba30 Regenerate tests/auto/widgets/styles
Change-Id: I8c9a63d0ac33465db832f01e1dd84abbea66fb30
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:25 +00:00
Alexandru Croitor
a678d9fb62 Regenerate tests/auto/widgets/kernel
Change-Id: Ib611ea32623e44c58432a15c73626aab36ab2b98
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:16 +00:00
Alexandru Croitor
02278007cb Regenerate tests/auto/widgets/effects
Change-Id: Ib31f764202635198b5cdf236ba19982bb3b18cbb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:06 +00:00
Alexandru Croitor
8801d499d0 Regenerate tests/auto/widgets/dialogs
Change-Id: Ief296935d274bfaa217442890927593f0875271a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:56 +00:00
Alexandru Croitor
52d9b2234c Regenerate tests/auto/widgets/widgets
Change-Id: I9d9360612931b29b5d13a224236ef650dc5c8e1d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:47 +00:00
Alexandru Croitor
bfbf3e0b3a Regenerate rest of tests/auto/gui
Change-Id: Iaaea50790161715517f7a4085116d5c893fa286b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:37 +00:00
Alexandru Croitor
3377978122 Regenerate tests/auto/gui/math3d
Change-Id: I7579ed464ec9211b1da7478c02e4e13a2a71277a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:27 +00:00
Alexandru Croitor
4936b6c795 Regenerate tests/auto/gui/kernel
Change-Id: I32046f33612f9b306dd889a0d42aa70d32375531
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:15 +00:00
Alexandru Croitor
43d7927004 Regenerate tests/auto/gui/painting
Change-Id: Id30f9e7e6cadb4a09c669c5688c01a84300a8c41
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:06 +00:00
Alexandru Croitor
cd258ca28a Regenerate tests/auto/gui/image
Change-Id: If6aa42d5b19227e488fc2fcf94b8eacc02c2c209
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:04:49 +00:00
Alexandru Croitor
b0a223cf08 Regenerate tests/auto/corelib/statemachine
Change-Id: I9b9dcb0ede68116033bcde69cc1b5fafb67a22d1
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-12 17:27:21 +00:00
Alexandru Croitor
2718f5928e Regenerate tests/auto/corelib/serialization
Change-Id: Id2e221e4018b46467203c8d6f29a9758c3c57a60
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:59 +00:00
Alexandru Croitor
5c1bb8e4d4 Regenerate tests/auto/corelib/codecs
Change-Id: Iea71e497e8bcf131ed89c9e576381dc305b1dd44
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:41 +00:00
Alexandru Croitor
8076afb3c6 Regenerate tests/auto/corelib/tools
Change-Id: I1ea8fbf509c7e6d556ebd974fcff9084bc668e17
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:27 +00:00
Alexandru Croitor
5447ccd469 Regenerate tests/auto/corelib/mimetypes
Change-Id: Id137b8e9f48edd65c4df901f11a8ae917395d6b6
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:15 +00:00
Alexandru Croitor
7adcdcbf80 Regenerate tests/auto/corelib/text
Change-Id: I34e24b7c2697bcdddc628855e2b539b8db1b98b0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:05 +00:00
Alexandru Croitor
f7d7021460 Regenerate tests/auto/tools
Change-Id: I25268499ff966ebf134150accbaec7634726fe40
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:41 +00:00
Alexandru Croitor
209c7238a7 Regenerate tests/auto/corelib/thread
Change-Id: Ib70f000480ffbbb994edd80d9e2c7f5d9e270e0c
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:29 +00:00
Alexandru Croitor
d802572f0b Regenerate tests/auto/corelib/animation
Change-Id: I698e8bf965cc928bf7f48f44c81bd0dc017f483c
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:18 +00:00
Alexandru Croitor
d58d7ebfea Regenerate tests/auto/corelib/kernel
Change-Id: I466387408d26854e11fde0a1fbef74c2fad764c7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:04 +00:00
Alexandru Croitor
812d45ed09 Regenerate tests/auto/corelib/global
Change-Id: I89a82f0cafeda2f38217a24f1c495344910fba1a
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:24:56 +00:00