Commit Graph

488 Commits

Author SHA1 Message Date
Tim Jenssen
d186d9df6a Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I0a598ba1b4d57be361a7a203d0c39e99b5cd5fba
2023-12-13 14:53:17 +00:00
Tim Jenssen
60d23bff03 CMake: make sure that deploy.py errors get caught
Change-Id: I05f818145ed29f4521bddc36051ae504c13278d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-27 13:45:16 +00:00
Eike Ziller
c3907bf781 Bump version to 12.0.1
Change-Id: Iac214602e3bfef975c8e4083ba251a652ed1ebc7
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-27 09:05:16 +00:00
Eike Ziller
702f4393f9 Bump version to 12.0.0
Change-Id: I47191ac3dcbfbde7f39bf2d322f8db488648aa35
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-13 08:40:38 +00:00
Eike Ziller
e6a39128f5 Merge remote-tracking branch 'origin/12.0'
Change-Id: Ib9f8b81d60162a8b01e7c627ba54901af68afa98
2023-11-10 11:23:21 +01:00
Cristian Adam
f90f60bb32 CMake: Fix QTC_STATIC_BUILD
Change-Id: Idfcd36f2d5fdaf09c958ff101aa5e83e0a29cb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 10:11:18 +00:00
Eike Ziller
5bdd3f8e1d Bump version to 12.0.0-rc1
Change-Id: I3b687e44c90dc18bb0d48bb47f230d8de6c8ca66
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-26 13:52:39 +00:00
Eike Ziller
0aded7311a Bump version to 12.0.0-beta2
Change-Id: I739670e5cf1d8c99c18d6fb30d1dd7a825e295cf
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-13 11:24:31 +00:00
Eike Ziller
58972890cc Bump version to 13.0.0-beta1
Change-Id: Ibdf1ae2189f5dea88e2a02fccf551e3ed159bb02
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-29 09:27:12 +00:00
Tim Jenssen
1a3a8ecc96 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Id242ab4ca485527defdcc1555d204e12e50ddb7a
2023-09-14 17:37:24 +02:00
Tim Jenssen
a603b65f18 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I2bf1a2a72d9765d9b4088840414b4933644db47a
2023-09-14 12:23:01 +00:00
Marco Bubke
9e60df9f7f CMake: Silence warning in third party code
Adding SYSTEM_INCLUDE for which you get no warnings. Fix
PUBLIC_SYSTEM_INCLUDE to work for all cases where PUBLIC_INLCUDES works.

Change-Id: I7059c2879004743c13c368220596081dd054407a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-07 08:53:43 +00:00
Christian Kandeler
fb4177a540 cmake build: Set the WITH_TESTS macro also in the tests themselves
Otherwise plugin and test code might parse header files differently.

Change-Id: I0243a7780b7095a4c518da26cc3cf23fd9f76cf5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-31 13:05:04 +00:00
Eike Ziller
fe18525326 Build/deploy: Move copying qtdiag to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: Ic71ad9a8ed522dc8c4eaa745ec519d9d705d1073
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-28 10:12:59 +00:00
Eike Ziller
6c9d4a60e0 Update yaml-cpp to 0.8.0
With removal of unneeded files similar to the original import,
the patch in patches/0001-... generated with

    git format-patch -D HEAD~1

to show just the removed files.

Change-Id: Ibfe64439bae5d1b1baa6b6bc47caf1ae030b3f9d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-28 06:29:55 +00:00
Eike Ziller
c9fd5465eb Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I0b0394dd68cf89b2579d623af897f55dc01aeea5
2023-08-25 11:50:14 +02:00
Eike Ziller
170f9acfb4 ClangTools: Add support for yaml-cpp 0.8
They renamed their target from `yaml-cpp`
to `yaml-cpp::yaml-cpp`

Still support < 0.8 though.

Fixes: QTCREATORBUG-29537
Change-Id: Iafa6e75998f0120610542b4c744b205aee3392a3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-25 09:21:42 +00:00
Eike Ziller
5f8fdc4e9e Bump version to 11.0.3
Change-Id: I9ab3fb0158eee32c8019635bcd9aae2455df98f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-24 08:29:28 +00:00
Marco Bubke
22166404f3 QmlDesigner: Use system includes for google test
System includes are silencing warnings.

Change-Id: I7d7954e01a28f94aa5983cfc44eba976d97b0311
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-23 10:50:09 +00:00
Cristian Adam
8642dd3b68 CMake: Fix build for Windows
The `env_with_default` function is part of Utils.cmake, which would need
to be deployed. But it can't be part of QtCreatorAPIInternal.cmake due
to its usage before the inclusion of QtCreatorAPIInternal.cmake in the
main QtCreator CMakeLists.txt file.

A sepparate function needs to do the task.

Amends 1036c776f5

Change-Id: I95344dd98c5fa0258303ed8d02855584a1945144
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-17 07:55:11 +00:00
David Schulz
1036c776f5 CMake: add environment variable for ccache support
Add another environment variable whether CMake should check for ccache
and adjust the compiler options accordingly when building Qt Creator.

Change-Id: I796f29d7f6ad4a1f054f978d50dbd0120b873aea
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-16 07:29:09 +00:00
Tim Jenssen
8812c1816b Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I23063e42621b272bd4b04a06746955e6b5768b49
2023-08-15 12:32:47 +00:00
Marcus Tillmanns
973f74bad3 Tests: Add NEEDS_GUI flag to add platform argument
Tests that create a QApplication need to be started with
"-platform minimal" so that they won't fail on build servers
without Display.

This also keeps them from distracting you if you run them while working.

Change-Id: I05df258b2204a3abd3cdea446d6a52f3e57a4a62
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-10 12:15:12 +00:00
Jarek Kobus
2732b6e939 Creator: Block the usage of foreach
Change-Id: I5557b1eccb8bd1e4acdc519ded799ce21c5be45e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-10 11:44:42 +00:00
David Schulz
4330736db3 Bump version to 11.0.2
Change-Id: Ib733cb5adf7fb583dc161d3d20d0c4a61638cf0e
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-09 06:33:29 +00:00
Eike Ziller
c7d0c73587 Build: Rename deployqt.py to deploy.py
It hasn't been about just deploying Qt for a very long time.

Change-Id: I72fb070db505909500d2e68f2bafb198c3342c2b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-26 09:16:05 +00:00
Eike Ziller
a419670ff5 Build: Change plugin json.in files to CMake style
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.

Adds a fatal message if it detects the old style in a .json.in file for
easier porting.

Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:21:16 +00:00
Eike Ziller
b11a6900e6 Build: Remove feature from the olden times
We don't set this to anything else anymore, so remove the option to set
it.

Change-Id: I9e2aced8909d557e3a4f0b8ca8fff70ac6ec2e1d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-25 12:28:33 +00:00
Eike Ziller
15383448c0 Bump version to 11.0.1
Change-Id: I94e939f2cf81adedea914873dc0b5aa87decdb2f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-21 12:26:57 +00:00
Tim Jenssen
8cde647972 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
  doc/qtdesignstudio/src/views/qtquick-designer.qdoc
  src/plugins/studiowelcome/stylemodel.cpp

Change-Id: I13c9e4e9404619d7ba649eae160774aafc042610
2023-07-20 22:18:47 +02:00
Cristian Adam
80196abd6f CMake: Remove Windows 8 WINVER / _WIN32_WINNT defines
This was required for older MinGW toolchains.

Change-Id: I89e048adf01fa2b04c52715f71bf266cbd65c44e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-11 10:35:46 +00:00
Orgad Shaneh
3745394fde Bump version to 11.0.0
Change-Id: Id20c9efb437a919d5d8a2f97b873f21468b0c5d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-10 06:13:10 +00:00
Tim Jenssen
d9910058a3 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I91d9877ef6637d21e1106d6d363275295e6b55a3
2023-07-04 20:36:03 +02:00
Christian Kandeler
b12ba08de0 Build systems: Do not put qbs plugins under the qtcreator plugins dir
Otherwise, the extension system will unnecessarily try to load them at
start-up.

Change-Id: I7a932904835cb387e3cf10924ca79a58e5f92b33
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 11:22:59 +00:00
Eike Ziller
68bc213644 Move app logo to main executable
Moves more branding information out of the plugins.

Change-Id: I71575f268dd8f2860f4da56101b0e3d9442df367
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-26 11:29:41 +00:00
Tim Jenssen
846f8dba92 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
2023-06-22 14:50:56 +00:00
Eike Ziller
3ff21fe3e1 Bump version to 11.0.0-rc1
Change-Id: I7b6fa9105858996a82584a417520d8e241c9c1e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-22 12:04:56 +00:00
Marco Bubke
44565bc39b GoogleTest: Hard wire google tests
There were problems with older google test versions which were found
instead. Now the google test version is always the same and there cannot
be "strange" compile bugs.

Change-Id: Ib3dc74d1abbe369fb37a4ee5616011d8e3696c01
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-22 10:19:50 +00:00
Eike Ziller
0f9b118776 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ib798dc9922c01b7667388ca03d3a248610f73028
2023-06-20 10:36:06 +02:00
Eike Ziller
694dec5b0f Build/translations: Fix if build dir contains regex characters
We need to escape all regex relevant characters before using the build
directory as part of a regex.

Amends fc236d4534

Change-Id: Idfb9e5a1733e153943781888976de97aac4fb8cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-06-20 06:54:10 +00:00
Eike Ziller
f88db30319 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ibb433d3e1ea2c0632dd2f710c8ec995de7599978
2023-06-19 10:08:56 +02:00
Eike Ziller
fc236d4534 Build: Avoid building Qt Creator when running translation targets
The "project sources" contain lots of generated files that we are not
interested in, simply exclude anything from the build directory.
The *_tr.h header that we generate for the wizards and external tools
are handled separately.

Change-Id: I2ab1d6ac4312b1140ee475f8f16ba82d8488c43e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-06-16 13:20:17 +00:00
Eike Ziller
db680ebbb6 Bump version to 11.0.0-beta2
Change-Id: I336891b48940457ad878a9c35799e1e8eabae6a0
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-12 06:51:26 +00:00
Burak Hancerli
8af0c065ac QmlProject: Reorganize unittests
Task-number: QDS-9946
Change-Id: Ib165340d13e40c6e8fba08a828ceecb312dd5dde
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-07 13:14:27 +00:00
Eike Ziller
40e7a9826d Bump version to 12.0.0-beta1
Change-Id: I887dc5a098dcb76d5a6ea7e3ba55c46bc974c882
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-25 12:13:44 +00:00
Orgad Shaneh
1512aaa0cd Build: Avoid passing unsupported flag to MSVC linker
Change-Id: Ia73aeccb824bca10ce928cb82d5ad77033521527
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-16 09:45:46 +00:00
Cristian Adam
0dbc208a07 CMake: Add -fPIC also for OBJECT libraries
add_qtc_library would have set the POSITION_INDEPENDENT_CODE property
for STATIC libraries on UNIX based systems.

The OBJECT libraries need the same treatment.

Change-Id: Ia333a36ea0f35d7db3ed876cdde5b895b47644c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 12:49:05 +00:00
Eike Ziller
30bd12d8dc Build: Add SOURCES_PROPERTIES to extend_qtc_target
This way the check if the target is enabled and the condition is met
doesn't have to be done manually.

Change-Id: If490a84fd5f1ede2d032c3800f69ede4f755bc2c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-04-21 10:55:16 +00:00
Eike Ziller
2bc37de42b Merge remote-tracking branch 'origin/10.0'
Conflicts:
	src/plugins/python/pipsupport.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/examplesparser.cpp
	tests/auto/examples/tst_examples.cpp

Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
2023-04-13 15:59:08 +02:00
Eike Ziller
a6512861ea Build: Fix result of ts_ targets
Created .ts files with the wrong name.

Amends 556e7315f7

Change-Id: I3c0199c564f47dce178a9d8218d5dacf8c75f78a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-04-11 13:59:36 +00:00