feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
76,860 Commits 108 Branches 368 Tags
2746b410d067c15d86489eb2fb65cf7edaebdc1e
Commit Graph

76860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eike Ziller
9328aaa835 Merge remote-tracking branch 'origin/8.0' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1ed3dd86fe5b4b87e3015c41652f5d0fa16d7070
 2022-07-25 09:25:00 +02:00
Eike Ziller
0acb7179c5 Merge remote-tracking branch 'origin/7.0' into 8.0 
Change-Id: I94cef21507693531914a67aa1f14b6e1ca613118
 2022-07-25 09:17:41 +02:00
Jarek Kobus
165fefffe8 Drop Qt5: Utils: Remove code below Qt 6.0.0 
Change-Id: I6557238ceccc11c2d1fd8168f1e578fd27a1ee95
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
 2022-07-25 07:12:50 +00:00
Eike Ziller
041ff11aae Core: Inline urllocatorfilter.ui 
Change-Id: I083bbd17cc0dc7134372f8712ee30fdb31232601
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-25 06:49:19 +00:00
hjk
6f62352bfa Macros: Inline macrooptionswidget.ui 
Change-Id: Ib35fd2816b7da5d2720f09ca89903549c7d3e66f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-25 06:18:14 +00:00
hjk
715e5800a5 Utils: inline projectintropage.ui 
Change-Id: I10f1b76b8bc88c56dfe6d215345d9b92a6832074
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-25 06:18:06 +00:00
hjk
1548eef10b Utils: Inline filewizardpage.ui 
Change-Id: I23235349babfb5a6b97679fedfc6db279dc472a2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-25 06:17:54 +00:00
Cristian Adam
5e88db1227 CMakePM: Make configure step in Settings collapsible 
This way the user interface is more consistent.

Change-Id: I93d029661d0e3955dc239e299dba2eda4f801149
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-24 11:16:30 +00:00
hjk
c1c917839d Beautifier: inline artisticstyleoptionspage.ui 
Change-Id: I822bb54f8169b288343cbc9b486ae7db4e1747c7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 16:56:48 +00:00
hjk
c4ac72066e Utils: Inline removefiledialog.ui 
Change-Id: Iaff681b83cb0e4b0bf0c993734a3a715ddcedd9e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 16:50:26 +00:00
hjk
5297cfb3c9 Beautifier: Inline configurationdialog.ui 
This slightly changes the setup by removing the horizontal
splitter which does not really serve a good purpose on a
freely resizable top-level dialog.

Change-Id: I1ba418dc9173af54aadab5e98144673b55544e8f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 16:36:54 +00:00
hjk
6aa712e11f Beautifier: inline uncrustifyoptionspage.ui 
Change-Id: I12a595995b1567506d7c2c029ec3b7a1d4837ca3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 16:32:16 +00:00
hjk
4933697d9a Beautifier: Inline clangformatoptionspage.ui 
Change-Id: I74709de4da72dc39e0667ba267ab841349125570
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 16:24:14 +00:00
hjk
9d4a55b3ab Beautifier: inline generaloptionspage.ui 
Change-Id: If989d3a636f7ad046c6a1efdb78a3c3c63e15756
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 16:15:13 +00:00
Alessandro Portale
d4643a627b App: Set QPixmapCache limit according to devicePixelRatio 
Higher resolution also means more data to be cached. The default 10MB
cache limit don't cut it in HighDpi, especially in cache-intensive parts
like the welcome screen.

Change-Id: I653a939c3a37f80647d73e8de8df616d5386e39c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2022-07-22 16:08:56 +00:00
hjk
212c5b09b9 Beautifier: inline configurationpanel.ui 
Change-Id: I1052b52955ba76bc404afa7d2dc5bee01651e2e0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 15:43:13 +00:00
hjk
ba51e3acac Utils: Make Layouting::Title even less special 
This goes a bit in the direction of property settigs for
arbitrary layout items.

Change-Id: I98500e213e3b22cc99038a1bcf688183588be248
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2022-07-22 14:41:20 +00:00
Thomas Hartmann
6ce37d1498 Fixes: license header 
Use GNU General Public License instead of commercial license only.

Task-number: QTCREATORBUG-27895
Change-Id: I1782638871f79b9729f0c7ce06abb38f6c34ed7a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-07-22 14:36:05 +00:00
hjk
aed29ad8c3 Core: Remove #include <QMainWindow> from icore.h 
Adapt users; also use dialogParent() instead of mainWindow() were
appropriate.

Change-Id: Ib60b118f05c986a70657446c5b2937074243bb5c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 14:11:46 +00:00
Jarek Kobus
f794bb0acf GitPlugin: Avoid using sender() 
Change-Id: Ie711630dd4b92bdc69990f421f69b578bc0fe9dc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2022-07-22 13:30:08 +00:00
hjk
f507597651 Boot2Qt: Fix crash when manually rebooting 
Fixes: QTCREATORBUG-27879
Change-Id: Id88c8246418217dd7fd75cc0fc436cb9e714d744
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-07-22 13:26:24 +00:00
Jarek Kobus
82e25998a7 BaseFileFind: Make recheckEnabled() virtual 
Override it in CurrentProjectFind subclass.

Change-Id: Ib805583b625f90fc5c6bde66cfc9600c0a81ef2a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-07-22 13:18:24 +00:00
hjk
4f4d77e797 Core: Avoid #include of fileutils.h in icore.h 
filepath.h is sufficient.

Change-Id: Ibd865020f7820a6c6478eca6cf7b8065cf8c8cf3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 13:07:43 +00:00
hjk
8d13ce2ee7 Android: Inline androidcreatekeystorecertificate.ui 
Change-Id: Ibfde487c963903b5a0c5af1beae4104777c00e9c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 12:34:42 +00:00
Jarek Kobus
91f4ee7644 PeripheralRegisterHandler: Drop unneeded if condition 
Amends 53e8f8c761

Change-Id: Ic27941cd2cb6725a7cd97f1ea5ea73bd4bc44ad0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 12:17:22 +00:00
Jarek Kobus
2d8ae7bbd9 ProjectExplorer: Avoid using sender() 
Add a m_defaultRunConfiguration field as a helper
when executing m_runActionContextMenu handler.
Don't store the data inside actions - use lambda capture
instead.

Do also some cleanup of unneeded () after lambda capture.

Change-Id: Ic9f4bc82681ed5a7de0b588f6e360ee02ce4f275
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2022-07-22 12:15:38 +00:00
Jarek Kobus
f516770281 KitAspectWidget: Use Utils::Guard in subclasses 
Change-Id: I5bffdb1139151a87fcad48d255729da54d33de51
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
 2022-07-22 12:12:27 +00:00
Jarek Kobus
30b815700e TaskWindow: Avoid using sender() 
Remove some unneeded Utils:: qualifiers.

Change-Id: I9abdd009089d273ebbe4a3b1662f09997565416d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 12:05:28 +00:00
Jarek Kobus
f9a3fcb660 RunSettingsWidget: Use Utils::Guard 
Change-Id: I1c77fe4f0ce0d28ab9d011045c64630387eaf7b8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 12:02:34 +00:00
hjk
39a89b3d06 Gitlab: Simplify dialog layout 
Remove several cases of unneeded nesting of boxes of the same kind.

Change-Id: Id9e03c0ea98839d5549e07bb3966496505cb880a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 12:02:31 +00:00
Jarek Kobus
063efbe693 Guard: Make it possible to lock/unlock manually 
Use it in some KitAspectWidget subclasses.

Change-Id: Ie683d5af6a44d0042456418af729a3d718396803
Reviewed-by: hjk <hjk@qt.io>
 2022-07-22 12:02:19 +00:00
Jarek Kobus
3f05594db1 QbsProjectManagerPlugin: Avoid using sender() 
Change-Id: I20a72623c8208c3c4b52997bf3d96d10a95ea60b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2022-07-22 11:59:18 +00:00
Jarek Kobus
2eb682802f ActionContainer: Avoid usind sender() 
Change-Id: Ic83179de74943a20de6abf516aa43a5cf034de65
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 11:59:01 +00:00
hjk
59fde5be05 BareMetal: Fix startup 
Task-number: QTCREATORBUG-27972
Change-Id: I16c6b07c33736f087ea805994fe51a9c109c5d95
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 11:49:39 +00:00
Piotr Mućko
ca9e652716 McuSupport: Use env variable as package's primary value 
Use env variable value as primary source before values from settings
and fallback value from JSON.

Change-Id: I0c0a4c2cdac65a075d9f38aa1557a9d303b30a5e
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2022-07-22 11:43:33 +00:00
hjk
23d9ef1adb RemoteLinux: Convert to Tr::tr 
Change-Id: I1c541d392992fb37acecbb98f331e01d7b73fbc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 11:11:48 +00:00
Jarek Kobus
aabf9e4fef SimulatorOperationDialog: Avoid using sender() 
Change-Id: Ib45839bfa7b5e62a9546643a4a94c975884ce8cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 11:07:27 +00:00
Jarek Kobus
2da897f60b DiagnosticView: Remove unused field 
Change-Id: I0f423c70c7868547547313e85fa27b6640a39f5c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 11:06:21 +00:00
Jarek Kobus
67b26a8987 CMakeGeneratorKitAspectWidget: Remove unused m_ignoreChange 
It's always false, so no-op.

Change-Id: Ie3a4de8ddaf98aff97c1672e696db21356110af2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-07-22 11:05:56 +00:00
Jarek Kobus
d4d5cc3a7d QmakeKitAspectWidget: Use Utils::Guard 
Change-Id: I312ba87cb7e198dbbbdca1b8f9c114bb3deb2b19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2022-07-22 11:05:36 +00:00
Jarek Kobus
3071524607 ClangToolRunWorker: Avoid using sender() 
Change-Id: I299fa6464b77aed3852d3b5a7ce4817678d5f369
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2022-07-22 10:56:59 +00:00
hjk
14c5390ffc Android: Inline androidsdkmanagerwidget.ui 
Change-Id: Ic20b209d92371184fdb458d1835852b6c042ad69
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 10:21:34 +00:00
hjk
50e53b3e63 Android: Inline androidsettingswidget.ui 
Change-Id: Ib30810b182eabd3d7f58691f3c3023151408ae04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 09:53:33 +00:00
Thomas Hartmann
63200ff771 QmlDesigner: Prefer autodected kits and use replacment kits only as fallback 
In QDS we want to priotize the kits we provide as part of the installation.

Change-Id: I282166bce811b6777088cd0dcde31dd8da785e2b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2022-07-22 09:32:15 +00:00
Eike Ziller
20e241737e Fix regression with permissions when running app locally 
Amends 3efa0f3961

The code path for running locally in some cases modifies the environment
(to support SUDO_ASKPASS), or the command (to support privacy settings
on macOS), but this was overwritten again after the above change.

This lead to e.g. the Qt camera example just crashing on macOS, instead
of the OS asking the user for permission to use the camera & microphone.

Change-Id: I41192bac736e4b07eb3530b37e35ad02a79e20a5
Reviewed-by: hjk <hjk@qt.io>
 2022-07-22 09:30:16 +00:00
Jarek Kobus
e9a0d06867 DebuggerKitAspectWidget: Use Utils::Guard 
Change-Id: I42407c110971f97599295f5d2be7652e512d3c72
Reviewed-by: hjk <hjk@qt.io>
 2022-07-22 08:58:00 +00:00
hjk
249d8585c4 Android: Compile fix 
Change-Id: Idd42fbb2b05f5d68de66f08a63b41b921ef8a315
Reviewed-by: hjk <hjk@qt.io>
 2022-07-22 08:55:48 +00:00
hjk
a7636d8d5c Android: inline addnewavddialog.ui 
Change-Id: Ib90981f8fb60b637deb03da5466f7aaa49369104
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2022-07-22 07:46:02 +00:00
hjk
b8a6d72137 Utils: Make Layouting::Group { .. } less weird 
It had a implicit vertical layout leading to unneded layout nesting
in quite a few cases. The price is an added Column { ... } in those
places where the implicit vertical layout was sufficient before.

Change-Id: I3ae1f03f9c1d691bd0c563b0447edd03ee02bbd2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-07-22 07:43:23 +00:00
Mats Honkamaa
87212ba639 Doc: Update Loader3D documentation 
Task-number: QDS-6972
Change-Id: I61259f4baef7f7607ab7d1dd9c8124e5ae3274c4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2022-07-22 07:42:17 +00:00