feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,529 Commits 108 Branches 368 Tags
5e059db065b1680c4f08b901b64f102300eda6e6
Commit Graph

225 Commits

Author SHA1 Message Date
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
Eike Ziller
baa83725f6 Remove ClangRefactoring and ClangPchManager 
This removes the plugins and tools, and removes all the tests that would
fail to build because of that.

Fixes: QTCREATORBUG-25659
Change-Id: I8adb5d503fc8eea313bcaada421f309dbbfa8c26
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2021-06-15 10:07:57 +00:00
Christian Kandeler
da8b3f237a qbs build: Prefer KSyntaxHighlighting from system 
Note that the system package will only be found with qbs >= 1.20.

Change-Id: I361b774d6b35fdbd0386144d4e9812f02f7841e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-05-11 14:30:18 +00:00
Eike Ziller
6bb918adab Merge remote-tracking branch 'origin/4.15' 
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
 2021-05-10 13:50:58 +02:00
Christian Kandeler
8d44ae5d7e sqlite: Fix qbs build 
Change-Id: I919fd20c445510231e66c08d3dafd5c1b5696ac7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-05-07 14:14:10 +00:00
Eike Ziller
bf5b1d714c Revert "Revert "Merge remote-tracking branch 'origin/4.15'"" 
This reverts commit f0a86d4510.

Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.

Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2021-05-07 09:07:40 +00:00
Marco Bubke
f0a86d4510 Revert "Merge remote-tracking branch 'origin/4.15'" 
This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2021-05-06 15:30:02 +00:00
Tim Jenssen
888ca0dd20 Merge remote-tracking branch 'origin/4.15' 
Conflicts:
	src/libs/sqlite/sqlitebasestatement.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
 2021-05-06 13:07:48 +02:00
Marco Bubke
1618937637 Sqlite: Use config.h instead of setting everything in the build files 
Change-Id: Ia70a5e78475a8b8078276df03330060c8785bf90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2021-05-05 15:14:49 +00:00
Eike Ziller
f4c3c49920 Bump version to 4.15.1 
Change-Id: Ibc2b495f00d33ec9c0c1400c9378cd80d95e11f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-05-05 14:48:35 +00:00
Eike Ziller
9f32c4aa2e Bump version to 4.15.0 
Change-Id: Idba4da565319c5b23e781f26fb1cf68722abbede
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-04-14 09:54:10 +00:00
Eike Ziller
a0d3d89e3f Bump version to 5.0 beta1 
Since we almost always do incremental changes instead of major overhauls
in one go, it doesn't make sense to couple changes in the major release
number to major feature overhauls (which is why we've stayed at "4"
since a few years now).

Switch to a version scheme more like semantic versioning. So next
feature release is 5.0, and the following feature-release after 5.0 will
be 6.0, and so on. After all we do break public API in these releases.

Fixes: QTCREATORBUG-25486
Change-Id: Id8510dd75077386e59c537a0c9768f27120a998a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
 2021-03-26 08:20:28 +00:00
Eike Ziller
2b521506f3 Bump version to 4.15.0-rc1 
Change-Id: I522a8c88d636bcc09de2be0b2aa4f47a1c080ac9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-25 11:15:10 +00:00
Eike Ziller
2bcc33e010 Bump version to 4.15 beta2 
Change-Id: I29436ee542d1f35e8117d670ea5cadd172432b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-16 14:40:20 +00:00
Eike Ziller
bce64778c5 Merge remote-tracking branch 'origin/4.15' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qtcreator_ide_branding.pri

Change-Id: I009308451e1c6276692412f498125d79a8f12a07
 2021-03-11 14:10:14 +01:00
Eike Ziller
e2b0547519 Merge remote-tracking branch 'origin/4.14' into 4.15 
Conflicts:
	qtcreator_ide_branding.pri

Change-Id: I9d9beb7b842800ac37bc628695fb01dc91923eb9
 2021-03-11 14:00:57 +01:00
Alessandro Portale
ac5bffc1e4 More bumping of the Copyright Year to 2021 
Also for the qmake and qbs based build systems.
Amends: 0af4f5152e

Change-Id: Ifcf1730d7b2b28dd9582d5b3569f50e3b7c91e07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-03-11 08:48:12 +00:00