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

7304 Commits

Author SHA1 Message Date
hjk
a2f0922334 CppEditor: Inline cppquickfixsettingswidget.ui 
Change-Id: I5110e71122cbcb349d46945da8e7d7fb3733b691
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 2022-11-18 07:24:48 +00:00
Tim Jenssen
213d60ad64 Merge remote-tracking branch 'origin/qds/dev' 
Change-Id: I74bf2bfb1eacb60675640c47eb41ce51dd6eb99f
 2022-11-16 18:22:59 +00:00
Thomas Hartmann
301e7398d9 QmlDesigner: Fix ProgressParSpecifics 
Task-number: QDS-8170
Change-Id: I5c9c4b1cb2751b89e7c1bb58c8f184dbbcf0623e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-11-16 13:48:04 +00:00
Eike Ziller
ae67799eb3 Merge remote-tracking branch 'origin/9.0' 
Change-Id: I2123e09f75199a63af6e8505fb8889e7f9d025d2
 2022-11-16 09:40:34 +01:00
Cristian Adam
b36cc91acb Qt Creator Plugin Wizard: Update GitHub Actions yml file config 
- move to only Qt6 builds since Qt Creator 9 only supports Qt6
- update the CMake Version
- update actions package versions not to get deprecated warnings
  from GitHub

Change-Id: Ief6c526ade69b4b120f614081bebfff5809101eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-11-15 08:38:08 +00:00
Eike Ziller
3f0f9a63c0 Merge remote-tracking branch 'origin/9.0' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangcodemodel/clangdcompletion.cpp

Change-Id: Iaa92bf057d7696d2da10802ff95e80863f3235d8
 2022-11-14 15:26:20 +01:00
Xu Shitong
f27d5b8784 Chinese translation update for 9.0 (Test module) 
Change-Id: I6c34ee286747ca0807e3208369a9e305f5c4a299
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2022-11-14 12:17:54 +00:00
Eike Ziller
8130494b5f Chinese translation update for 9.0 
Change-Id: Ia00b2fdc7b3ea5e144cbdd49ba8e1cab80fbac79
Reviewed-by: Xu Shitong <xushitong@uniontech.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2022-11-14 12:17:42 +00:00
Henning Gruendl
1b6fd9f328 QmlDesigner: Update SpinBox 
Update SpinBox to the state of RealSpinBox.

Change-Id: Ib4d622edbf3d3cfb22adc7b410a97f348e235270
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-11-11 14:43:40 +00:00
Henning Gruendl
dbca9418ff QmlDesigner: Fix CheckBox spacing 
Change-Id: Ie4b365e67886ee20dc6632da118c561d0e93c95f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-11-11 14:43:03 +00:00
Eike Ziller
f8792dc9e6 German translation: ProjectExplorer 
Change-Id: I1b069aea0a6d12c1cd2cee6a0d3b4febc7da8331
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-11 14:34:44 +00:00
Eike Ziller
33a33612c8 Theme 'dark': Use accent color on macOS 
Fixes: QTCREATORBUG-28374
Change-Id: Ifb7fa83c8afc1be0a919c775f7d04e229f146438
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-11 13:52:49 +00:00
Mahmoud Badri
cbea3f15ce QmlDesigner: Allow material browser texture selection 
For now texture selection is independent from material selection.

Change-Id: Iffa8354948f0ce64e4a54458531274e0441e87ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-11-10 13:47:37 +00:00
Eike Ziller
10dca6b37f Merge remote-tracking branch 'origin/9.0' 
Change-Id: Ie069f3b2a1200b3e665341b1d56ce836024b0d29
 2022-11-10 13:22:43 +01:00
Mahmoud Badri
bb64505cab QmlDesigner: Implement adding a bundle texture as light probe 
Fixes: QDS-8205
Change-Id: Icb57287fa36df5d44d59ffc64e26fa3d778d24d6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-11-10 12:13:58 +00:00
Rami Potinkara
50b749fc42 Android: Qt 6.5 NDK25 update to sdk_definitions.json 
Qt 6.5 NDK25 as new default.
Qt 6.4 NDK23 as it requires it.

Task-number: QTCREATORBUG-28426
Change-Id: I2d742481a1c490cc9dfe8a25870a5699e38c4315
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
 2022-11-10 09:12:01 +00:00
The Qt Project
f56420ee07 Merge "Merge remote-tracking branch 'origin/9.0' into qds/dev" into qds/dev 2022-11-09 15:42:39 +00:00
Tim Jenssen
f8c99ebd9a Merge remote-tracking branch 'origin/9.0' into qds/dev 
Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
 2022-11-09 16:41:12 +01:00
Marco Bubke
63022d08ea QmlDesigner: QmlPuppet as standalone tool 
The qmlpuppet is now a standalone tool. There is new a library too with
the communication code. That is shared between the designer and the
puppet. It's in a .cmake file so it can be included by the standalone
tool if it is not part of a designer build.

Task-number: QDS-5879
Change-Id: I2bc2a0b463fbb3e0c8c23d182abfd368cf87e968
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2022-11-09 12:29:38 +00:00
Eike Ziller
b038ea3a40 Fix debugging with LLDB 
Broke with bb11788a0a

Change-Id: Ie02a36b98be83bd4721eacc834321a5494c584a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-09 11:47:52 +00:00
Tim Jenssen
63d3a6bd3d Merge remote-tracking branch 'origin/8.0' into 9.0 
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc
 2022-11-09 11:45:25 +01:00
Eike Ziller
df946c77dc Chinese translation: Run lupdate for qtcreator_zh_CN.ts 
in preparation for the translation. Result of
`lupdate . -no-obsolete -no-ui-lines -locations none
 -ts share/qtcreator/translations/qtcreator_zh_CN.ts`

Change-Id: I1e7389aae93f1aee8594f35e53531ee53e5f0ed6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Xu Shitong <xushitong@uniontech.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-11-09 07:03:20 +00:00
hjk
bb11788a0a Debugger: Avoid quadratic behavior for larger debug output 
Task-number: QTCREATORBUG-28111
Change-Id: I0567b6af9f74c2d335d19a52765834ef7cee9449
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-11-08 13:53:30 +00:00
Miikka Heikkinen
d9d4d1829a QmlDesigner: Fix material name editing issues 
Material name field in material browser now ensures that the start
of the string is visible when editing is not focused.

Any click outside the name field will take the focus away from the
field, and name field state is properly updated when focus goes
away for any reason.

Trying to set same name as before is ignored instead of changing the
name to <oldName>1.

Fixes: QDS-8185
Change-Id: I723e3ae312e3e2c4ce8a95a3b05effcee2bae328
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2022-11-08 12:21:06 +00:00
Eike Ziller
56bc91d0d8 German translation: Welcome plugin 
Change-Id: I8d50831e3fc20364c4738c0fe64ca2feacf72c41
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-08 10:56:50 +00:00
Eike Ziller
48c7e78e01 German translation: TextEditor plugin 
Change-Id: Ie4dfe8001ecb51e7f012080230da0ca4c0ccd56f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-08 10:56:26 +00:00
Mahmoud Badri
15dd073e0c QmlDesigner: Add basic drag-n-drop support to textures 
Dropping textures to different views to be handled separately.

Change-Id: I1e0ac5681e5e1b3dca8bdaf6819a6b699f629e79
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-11-08 10:22:53 +00:00
Mahmoud Badri
d5a7f25e60 QmlDesigner: Implement content library view 
Fixes: QDS-8058
Fixes: QDS-8059
Change-Id: I1adfdc7ac15141e010467813ec6e673060269241
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-11-08 10:04:43 +00:00
Eike Ziller
9eebcf3ef0 Restrict Python application wizards to desktop 
Fixes: QTCREATORBUG-28258
Change-Id: I9814abe093efbff0b7b15711d4773c8cbcdc8e41
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
 2022-11-07 13:56:55 +00:00
Eike Ziller
63c1bc572a Merge remote-tracking branch 'origin/9.0' 
Change-Id: Ie24672b00aae6c0afa5931d87e6e1c24fb841161
 2022-11-07 12:59:28 +01:00
David Schulz
0b1d265991 Editor: use less bright colors in diff editor for dark color scheme 
Change-Id: I9d092bf2fdf38a237b41b8a71ea54eb03dd08265
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-11-07 07:33:56 +00:00
Eike Ziller
5335de2669 German translation: ExtensionSystem 
Change-Id: Ia74823094434138889bf6699283e183a925584bf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-07 06:50:08 +00:00
Eike Ziller
7203d6d44b German translation: Bookmarks 
Change-Id: I4ee0d059d30b99742a1706e6e5769e71251ae6b7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-04 12:17:18 +00:00
Eike Ziller
ead9dd987f German translation: Core plugin 
Change-Id: Iec22406e32a21c58629889361fba22f0278da5b1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-04 10:54:21 +00:00
Eike Ziller
935f2e5d5e German translation: Help plugin 
Change-Id: I555c20649ed838c08a074c76f78ba10a310c53a9
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-04 10:53:52 +00:00
Eike Ziller
e19c80b2c0 German translation: UpdateInfo plugin 
Change-Id: I0dc74089a67245d2c7ec1ebcaf17acd848625037
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-04 10:53:36 +00:00
Eike Ziller
6401479dfd German translation: lupdate ts file 
Result of `cmake --build . --target ts_de_cleaned` in the build
directory, in preparation for translations.

Change-Id: I9cf3b1aa08244e157e784ae148ed9b1dd308adb5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-11-04 10:53:20 +00:00
Tim Jenssen
40072fb5c7 Merge remote-tracking branch 'origin/9.0' into qds/dev 
Change-Id: I5f72661f1fc54ff861e2cbbaa4cb32f867924c3b
 2022-11-03 15:32:29 +01:00
Eike Ziller
68388a38dd Merge remote-tracking branch 'origin/9.0' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399
 2022-11-03 13:44:37 +01:00
Thomas Hartmann
318a2aff2f QmlDesigner: Enforce rules for QML component names 
Since a QML component is generated from the effect,
the same rules for names should apply.

Task-number: QDS-8152
Change-Id: I607c2771401fec2259b1e1aac9a37707aa1328b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2022-11-03 10:54:18 +00:00
Thomas Hartmann
7b9303007a QmlDesigner: Avoid error messages when adding effect 
* Removing the summary page
* Adding DoNotOpenFile option

By default, the wizard expects to open a file.
Setting DoNotOpenFile to true does suppress this.

Task-number: QDS-8151
Change-Id: I62264733788dbbe1b017beaa428356548a1a3692
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2022-11-03 10:53:50 +00:00
Thomas Hartmann
73cdb6239d QmlDesigner: Show Effect wizard only in enterprise version 
Change-Id: If0c99beec083514ed5c531bb7a67cd7a392c3108
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2022-11-02 12:44:56 +00:00
Thomas Hartmann
b1c48a27c0 QmlDesigner: Move effect wizard to qmldesigner/studio_templates 
This is the folder QDS looks for the wizards.

Change-Id: Id69f50f48eeb4668dff2840a36149408e0709a06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-11-01 19:14:08 +00:00
Eike Ziller
b402f35481 Merge remote-tracking branch 'origin/8.0' into 9.0 
Conflicts:
	doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
	src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designercore/model/import.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp

Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
 2022-11-01 15:38:49 +01:00
Tomi Korpipaa
02f7c9c3eb Import QQEM effects via drag or add button 
Be able to add effects using file system drag&drop or using the add resource button

Task-number: QTBUG-100626
Change-Id: I33c3ebe29797325a2ed1819bd867e97ae3f8b61c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2022-11-01 12:55:28 +00:00
Rainer Keller
b23d066f9d McuSupport: Remove ASM_MASM from CMake project languages 
This was never required and was added to the list by accident.

Task-number: UL-5875
Change-Id: I7957d49e9c87da91a81a363185f11e8331c650c3
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-11-01 07:46:41 +00:00
Alessandro Portale
ce89ee59c5 Translations: Remove duplicates 
Amends: 698583dc01

Change-Id: Ia3dfa1743b9959c85cd09b59c3ca08b82c18fa0e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-10-31 10:32:20 +00:00
Mahmoud Badri
2a4de97a84 QmlDesigner: Fix toggle section expand after choosing expand all 
Fixes: QDS-8104
Change-Id: I6191a7b249490e6193acdd8b618c0817a3fc6ab3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-10-28 08:20:26 +00:00
Tim Jenssen
ad3169bedd qds: fix mobile scroll projects template 
I guess this was removed by accident at
d99a6d2efe
so I just adding it back now.

Task-number: QDS-8111
Change-Id: Ib42ce5cc0cf13608f07b0671adce149c15878ef0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
 2022-10-27 15:06:40 +00:00
Thomas Hartmann
ed0727e88f QmlDesigner: Add option for Qt 6.4 
Change-Id: I7548a680a5773d7d2799fa5998bdc0956fb2e9c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2022-10-26 14:05:17 +00:00