feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,631 Commits 108 Branches 368 Tags
cf7a03ef0d6bb4ddc79a3dc7fde7951a97dba0e9
Commit Graph

89 Commits

Author SHA1 Message Date
Tim Jenssen
b4061e223e Merge remote-tracking branch 'origin/qds/dev' 
Change-Id: I907e067abba640d27313ce03bc41326d3ed750f0
 2024-08-06 19:04:41 +02:00
Tim Jenssen
e5d8d1cef0 Merge remote-tracking branch 'origin/14.0' into qds/dev 
Change-Id: I1c354102209ba0c3505e3e2745e64ce77cc22bb3
 2024-07-23 15:28:59 +02:00
Eike Ziller
7dab192007 Bump version to 14.0.0 
Change-Id: I4c85e3faa9d22bbf05db94fc76adec2aa215dcaa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2024-07-12 08:32:08 +00:00
Tim Jenßen
93588dbee2 Merge remote-tracking branch 'origin/14.0' into qds/dev 
Conflicts:
	doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
	qt_attributions.json
	src/libs/sqlite/CMakeLists.txt
	src/plugins/qmldesigner/CMakeLists.txt
	src/plugins/qmldesignerbase/QmlDesignerBase.json.in
	src/plugins/qmlprojectmanager/CMakeLists.txt
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h

Change-Id: If33e41d8951a49acaba0a74c3e5848eef52bb945
 2024-07-10 18:11:28 +02:00
Eike Ziller
06a01d56a5 Bump version to 14.0.0-rc1 
Change-Id: I09803077f7387a2ace85a074498c9f503a7d190a
Reviewed-by: David Schulz <david.schulz@qt.io>
 2024-06-28 12:35:35 +00:00
Marco Bubke
b2c85538b1 Add Design Studio for Linux 
Add AppStream data and desktop file for Design Studio.

Change-Id: Icc5cca03a3c0945a2f90b39fdd4c7dcecd0e8d6b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2024-06-20 08:57:36 +00:00
Eike Ziller
f22660facb Bump version to 14.0.0-beta2 
Change-Id: I1ca19c9cb6f7d8bfec665300c23389ba22e93c1e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2024-06-14 12:33:32 +00:00
Eike Ziller
bb904d878f Bump version to 15.0.0-beta1 
Change-Id: Ie40901ed9205ce93f0307cb912d5c626469bc53d
Reviewed-by: David Schulz <david.schulz@qt.io>
 2024-06-03 10:25:25 +00:00
Eike Ziller
717a6ce8a0 Bump version to 13.0.2 
Change-Id: I69a59c32fbfe699c788c15e64557a9a02b4c186c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2024-05-14 06:55:08 +00:00
Eike Ziller
f88ca7be28 Bump version to 13.0.1 
Change-Id: I1269daf9f87b95af0814d1b06c93e947a0555675
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2024-04-05 10:43:27 +00:00
Eike Ziller
7fbb7e0bee Bump version to 13.0.0 
and fix copyright year for the Qbs build

Change-Id: If9f9d152c9a8e66274cfbee3198087848e0fe74c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2024-03-14 15:32:15 +00:00
Eike Ziller
3ff56b8079 Bump version to 13.0.0-rc1 
Change-Id: I5b4efa41aabce4b007308a53ea9ac291a3a3ad58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2024-03-01 11:24:18 +00:00
Eike Ziller
198251db9b Bump version to 13.0.0-beta2 
Change-Id: Ia03b43a4e3906350d79a2ba4dbfd800c5f80f77d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2024-02-16 08:17:44 +00:00
Eike Ziller
5334081270 Bump version to 14.0.0-beta1 
Change-Id: I62f28969f68889f628fb37e8a1eb390a62bd6e46
Reviewed-by: David Schulz <david.schulz@qt.io>
 2024-02-15 12:57:11 +00:00
Eike Ziller
2ea3f5382b Merge remote-tracking branch 'origin/12.0' into 13.0 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake

Change-Id: Id7ac4d8b397cc20356cfbe30abcf43f53c4d2ff4
 2024-02-07 12:22:50 +01:00
Eike Ziller
a8ed2c505a Update copyright year, it's 2024 now 
Change-Id: I183b87bf80332c789d000c37fd08f75297031b02
Reviewed-by: hjk <hjk@qt.io>
 2024-02-07 09:27:02 +00:00
Eike Ziller
92d1938ab4 Bump version to 12.0.2 
Change-Id: Ia7514eccbb61380a502049cfa9f536981c0cac1f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-12-18 16:39:52 +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
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
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
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
Alessandro Portale
623a7fa358 Fix QtCreatorIDEBranding.cmake 
Change-Id: I1513058affb047c1a6483fbcd45547348d75e756
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
 2023-03-24 14:49:37 +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
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
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
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
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
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
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
3d4d7c7e14 Merge remote-tracking branch 'origin/5.0' 
Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
 2021-09-13 17:03:55 +02:00
Eike Ziller
6528bd6a27 Add branding option for application icon and logo 
Change-Id: I23ee91ab47d06aab370b2083d4f96f7833bf16ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-09-08 06:29:51 +00:00
Eike Ziller
28f1519182 Bump version to 5.0.1 
Change-Id: Ic4daa60f1cb55a15a6885292cf2928910ae3f563
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-08-27 12:26:49 +00:00
Eike Ziller
1dd0511b49 Bump version to 5.0.0 
Change-Id: I1203dd71cc2f1e6d1f435dbfdc07376130fbb61f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-08-13 07:25:12 +00:00
Eike Ziller
67d85d1592 Bump version to 5.0 RC1 
Skipping Beta 2 due to summer slothfulness.

Change-Id: If3ee6c1c218b17d413d2f28023b9fb094a969cdd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-07-16 09:31:23 +00:00
Eike Ziller
f6290d52f5 Bump version to 5.0 beta2 
Change-Id: Ie8a9f5be343d5aa939b9ec54e549c604d05d223f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2021-07-12 09:41:54 +00:00
Eike Ziller
1d05a2b5af Merge remote-tracking branch 'origin/5.0' 
Change-Id: Icea9215204a7247c5fbbc818833132676a3b9e11
 2021-07-06 16:00:14 +02:00