feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
86,026 Commits 108 Branches 368 Tags
8b78eb2d22c08bc32870b841cd53213cb15b8dd7
Commit Graph

241 Commits

Author SHA1 Message Date
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
Christian Kandeler
a217fa0c22 qbs build: Clean up testing infrastructure 
- Rename ambiguously named "testsEnabled" property to "withPluginTests"
  and fix the wrong uses.
- Move AutotestRunner out of main project file and into tests.qbs.
- Move "withAutotests" property into qtc module. We cannot remove it
  from the main project file just yet, because some manual tests do not
  make use of QtcManualTest at the moment.
- Do not remove the autotests from the project tree if autotests are
  disabled. Instead, just disable the products.

Change-Id: I74a4cc717d9adbe53d37536b2565111e1617115b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-09-19 13:16:28 +00:00
Christian Kandeler
d00d056b32 qbs build: Remove compatibility code for outdated qbs versions 
Change-Id: I2667e0e76dbcf692a25a5d4d5f020ac90f0be478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-09-19 09:56:39 +00:00
Christian Kandeler
621902d485 qbs build: Remove left-over "dev package" functionality 
This is no longer relevant.

Change-Id: Ib9d851d69c5fc33d4808d883f6bec24fb3d1c4a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-09-19 09:56:26 +00:00
Christian Kandeler
93273af6dc qbs build: Move pluginjson replacements property to the module 
... where it clearly belongs.

Change-Id: I22d098b701e4921cde53ab34d11ab0078326ab94
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-09-14 12:21:46 +00:00
Jarek Kobus
26853ee7a9 Creator: Block the usage of foreach in qbs build 
Change-Id: If1fc3a69505cf8c2b7e931861a07991643d5e8d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2023-08-10 12:51:10 +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
Christian Stenger
c6a8a76be0 Fix Qbs build 
Change-Id: Ic02f12a08990bfa9eb3f0131141407373248bae1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2023-07-05 09:21:08 +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
6836caa14c Do not compile PROJECT_USER_FILE_EXTENSION into plugins 
Set it in the app info in the main application and read it from there.
Moves more branding information out of the plugins.

Change-Id: I2f2e9fc96900793be15ac1907df70dda31c1b9c1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-06-26 06:58:36 +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
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
Eike Ziller
c9696fbabb Merge remote-tracking branch 'origin/10.0' 
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
 2023-04-24 08:52:35 +02:00
Christian Kandeler
8ac826a1a0 qbs build: Fix pluginjson module 
The "product" qualification was missing for "sourceDirectory". This
currently happens to work due to scope pollution in the qbs
implementation.

Change-Id: I61758023d39d00505c586c1e5ad78185a69c0db1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-04-21 08:16:35 +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
Christian Kandeler
f019dd14e0 qbs build: Fix qtc module 
There should be no symbol "Qt" in that module's scope; it's a qbs bug
this worked so far.

Change-Id: Iddf69669656b41fa7a7a96b2fae4f6584275812d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-04-04 12:25:19 +00:00
Eike Ziller
dc9fc28ac5 Bump version to 10.0.1 
Change-Id: I6828aa83a6ce828a12b30e1a0d942ec64f582cbe
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-03-29 12:34:01 +00:00
Eike Ziller
1df085b9b4 Bump version to 11.0.0-beta1 
Change-Id: I6f87635449be080dcc532168c0180945f4ddc02c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-03-24 14:26:44 +00:00
Eike Ziller
a50f2620ec Bump version to 10.0.0 
Change-Id: I396d3d42deb825e3cd34728e38989a6ad4f09006
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-03-17 12:23:19 +00:00
Christian Kandeler
bffd6b3382 qbs build: Fix gtest_gmock module 
There was a module name appearing where it shouldn't have. This just
worked accidentally due to a bug in the qbs implementation.

Change-Id: I768b5cefd82f201138e6e07c72867ec8cb62dd2b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-03-10 11:47:51 +00:00
Eike Ziller
b7a42f5802 Bump version to 10.0.0-rc1 
Change-Id: I3aee0fbdd05a3ebc438c4ff62a43dafb6856e7a7
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-03-06 13:14:30 +00:00
Eike Ziller
c41b417748 Bump version to 10.0 beta2 and copyright year 
Change-Id: I633df92077441d6eab1390259769488687803a9f
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-02-20 14:24:04 +00:00
Christian Kandeler
8096b9f524 Update qbs submodule to HEAD of 2.0 branch 
Change-Id: If53431a0cf8bf412a28e606b0712e0acb26e07f5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-02-07 13:48:59 +00:00
Eike Ziller
8b028a69a7 Bump version to 10.0.0-beta1 
Change-Id: Ieb90096775fecfb4bfe1228372a1a3b0d9512faf
Reviewed-by: David Schulz <david.schulz@qt.io>
 2022-10-05 09:20:53 +00:00
Christian Stenger
26e47cb6ce Fix Qbs build on Windows 
Change-Id: I0d03a73731eb02852d34626ef243597214597ee8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2022-08-17 14:44:17 +00:00
Eike Ziller
99a116d721 Bump version to 9.0.0-beta1 
Change-Id: If64527bc1f5af72f488a96bb134e70a4194515af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-07-08 13:49:19 +00:00
Eike Ziller
c857644c14 Bump version to 8.0.0 
Change-Id: Ibf884cf0128e6e24e09c0b04e20a4a8ba26313d7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-07-07 13:26:34 +00:00
Eike Ziller
f2216f3893 Bump version to 8.0.0-rc1 
Change-Id: I6784f126f9492a7968027f5edb995c94cc097ca3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-06-29 09:24:39 +00:00
Christian Kandeler
d4b8739653 qbs build: Fix building with MSVC and Qt >= 6.3 
Change-Id: I59439217575bdcc170f38382129fa5f13edb23e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-06-17 15:24:00 +00:00
Eike Ziller
5f48066328 Bump version to 8.0.0-beta2 
Change-Id: I02a09e916d11c7ce28b2d58ba7517e582e14be06
Reviewed-by: David Schulz <david.schulz@qt.io>
 2022-06-17 11:14:32 +00:00
Christian Stenger
2e725b4869 Fix qbs build 
Amends 88781a003f.

Change-Id: I5b44d89cc1b536d0d533cd29fc3a06005a7c80d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-04-29 10:15:21 +00:00
Eike Ziller
8259df00d0 Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportplugin.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: Ib423e9f23877176f01b188104b0a179ed32c4770
 2022-02-22 14:06:41 +01:00
Christian Stenger
eccbc0fbcc Qbs: Factor out gtest dependency check 
..to make it re-usable.

Change-Id: I7653ee7b3ced5fb9d2b7262aecdab12438628928
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2022-02-22 05:33:10 +00:00
Eike Ziller
dfd3f81084 Bump version to 7.0-beta2 
Change-Id: Id6c117792e2dbf3a15fcafcc815a243535357f41
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-02-14 09:17:39 +00:00
Eike Ziller
76f5b73e98 Bump version to 8.0 beta 
Change-Id: I03a99d3b134a2116eb12e6d4e98b994d684f133c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-02-11 13:10:49 +00:00
Christian Kandeler
657cef6109 Fix qbs build 
Amends 704f239b55.

Change-Id: I18a0c52850340a8ed73fe236b6304102f631e370
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-01-19 14:35:20 +00:00
Eike Ziller
d8e393953d Merge remote-tracking branch 'origin/6.0' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
 2022-01-19 13:36:24 +01:00
Eike Ziller
f708e0e70c Update copyright year 
Change-Id: I42049e2b3a78ee3968e3df7dfea229c3927c3a75
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-01-19 12:34:26 +00:00
Eike Ziller
58f2bdaa9b Bump version to 6.0.3 
Change-Id: I77600bb39157c7c228e1fd0aee86c4f3ec9e7e65
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-01-19 12:34:20 +00:00
Eike Ziller
303f958ee0 Bump version to 6.0.2 
Change-Id: I4e6fcbded04028bf20433984f0679fafa54da310
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-12-17 13:24:30 +00:00
Eike Ziller
4cbfdecaf3 Bump version to 6.0.1 
Change-Id: Idc7519d7b74968cb6bdb473ff3dabff18ad0cee5
Reviewed-by: David Schulz <david.schulz@qt.io>
 2021-12-02 11:15:35 +00:00
Eike Ziller
25f1efc2b6 Bump version to 6.0.0 
Change-Id: I68af70325909705107b2e880011c72d0b75000ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-11-11 14:43:55 +00:00
Eike Ziller
ab86842ac5 Bump version to 6.0-rc1 
Change-Id: I08fc4a48ad6089e4477230824317ae0f1bd408e5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-10-28 11:11:27 +00:00
Eike Ziller
0543a810e5 Bump version to 6.0.0-beta2 
Change-Id: If15ba5f3b6484a7b649baac5bd0eb25147cc10db
Reviewed-by: David Schulz <david.schulz@qt.io>
 2021-10-14 10:04:12 +00:00
Eike Ziller
c2d9495b62 Bump version to 7.0 
Change-Id: Icc31b9c768480885593794b59a1997c352ad774c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-10-08 09:17:03 +00:00
Eike Ziller
2bfcc3739f Bump version to 6.0 beta 
Change-Id: I945c2bc0f400191efdfd37523a66ffedee0deb09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-06-29 11:06:38 +00:00