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

7806 Commits

Author SHA1 Message Date
Thomas Hartmann
33c88a0ced QmlDesigner: Expose component url 
Change-Id: I2b1708e6f87b00ad0b56c04f591ba24720a886ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-05-06 20:17:01 +00:00
Tim Jenssen
d5b83fc637 Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59 
Change-Id: Ic3ae0fd8c779c0bac8a0f01e87043251b3ce7fd4
 2020-05-06 19:51:29 +02:00
Tim Jenssen
f5a85171dd Merge remote-tracking branch 'origin/4.12' into qds-1.50 
Change-Id: I831e9d65be0009d0fd98c19aa38fa6fb69eed421
 2020-05-06 19:49:12 +02:00
Brook Cronin
559df59907 Theme: add new dark and light design themes 
Change-Id: Ibc65528694d5b8e55e17a80ecd82497c4ab98499
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-05-06 16:15:43 +00:00
Thomas Hartmann
3c0cd3baca Update designer theme to new color roles 
Change-Id: I39ece78e3961d6c2705abcdefcffc4b9cdd8e704
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-05-06 15:59:18 +00:00
David Schulz
04da8f4178 Debugger: prevent calling functions on windows targets 
This will result in a crashing gdb.

Fixes: QTCREATORBUG-23982
Change-Id: I59b65c5854bb4b7cbd59522a555388d1e833a560
Reviewed-by: hjk <hjk@qt.io>
 2020-05-06 12:55:49 +00:00
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12' 
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
 2020-05-06 09:43:20 +02:00
Tim Jenssen
f33dddaaec Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59 
Change-Id: Id492d324031d4d5fb919eca80ffae4baa50f247f
 2020-05-05 21:01:17 +02:00
Tim Jenssen
c5157368bd Merge remote-tracking branch 'origin/4.12' into qds-1.50 
Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
 2020-05-05 21:00:19 +02:00
Thomas Hartmann
417c96828a QmlDesigner: Add easing property for animations 
Task-number: QDS-2014
Change-Id: Ie9ea81dd52f3ca941afe77e39a4f5e3a2a428a68
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-05-05 16:08:09 +00:00
Eike Ziller
cc04c8d8e4 CMake build: Make translation function available to external plugins 
And fix that the "ts_all" target did not get the custom target prefix.

Change-Id: Iff6a5e328456f3d949c31f2e41b48c400fad773c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2020-05-05 09:48:31 +00:00
Alessandro Portale
67828b4fe5 QmlDesigner: Add a missing import to the PropertyEditor Theme 
Change-Id: I4b6151b1e12311334a0c32e2fa6f7c30db150c92
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-05-05 07:03:32 +00:00
Thomas Hartmann
8a59bf19fe QmlDesigner: Update icon font 
Change-Id: Ic1b59e1a026c4422b116bc3b5b262d077f1a9a1a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-05-05 07:03:21 +00:00
Michael Brüning
b80744903e Fix build eror in ChangeLanguageCommand on macOS 
Added missing includes.

Change-Id: Ic7823176fd7d7cc05ddbe62133974b3052c6e2e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-05-04 15:11:07 +00:00
Miikka Heikkinen
3e85e93243 QmlDesigner: Close property editor comboboxes on selection change 
Change-Id: I6f063a4884367bcf97ff79a5dcac42caf4a01118
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2020-05-04 09:58:37 +00:00
Eike Ziller
be73f41ad4 Merge remote-tracking branch 'origin/4.12' 
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
 2020-05-04 10:52:34 +02:00
Brook Cronin
96cd1bffae Theme: add controls theme to creator themes and map to controls theme values 
Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2020-04-30 15:43:45 +00:00
Marco Bubke
dacea667ed QmlDesigner: Add ChangeLanguage command 
Change-Id: If79de7d04717ad81af05411e61c262b9ff70129b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-04-29 06:17:34 +00:00
Thomas Hartmann
39249bd91d QmlDesigner: Fix font section 
Change-Id: I48b772c5ae81fe7bfe9f5d21f0eca20954827c50
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-28 15:01:30 +00:00
Tim Jenssen
53d161c98e Merge remote-tracking branch 'origin/qds-1.59' 
Change-Id: I8a5d7d98b4d75379fe3953fe00bdb939d1722676
 2020-04-28 16:18:24 +02:00
Eike Ziller
e9661e43cb Merge remote-tracking branch 'origin/4.12' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
 2020-04-28 15:48:36 +02:00
Alessandro Portale
6efed7140b share: Remove qtcreator/welcomescreen 
Left-over from when the welcome screen was still implemented in qml.

Change-Id: I94c187d820440568e198f1fcaa09f67d2c688bcf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-04-28 11:08:37 +00:00
Tim Jenssen
6c2ae3519e Merge remote-tracking branch 'origin/4.12' into qds-1.50 
Change-Id: I9bc1f87c3ab4a5ff0c84efa05d22763b8a1084c3
 2020-04-28 11:53:38 +02:00
Eike Ziller
fc94174bf7 CMake build: Fix copying & installation of resources 
- just copy & install whole directories, like the qmake build (basically)
- copy & install scripts/ only on macOS
- do not copy or install welcomescreen/ which is no longer used

Fixes: QTCREATORBUG-23907
Fixes: QTCREATORBUG-23909
Fixes: QTCREATORBUG-23911
Change-Id: I0f9016848d15b214c40f454f39c5560d1faa4f32
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
 2020-04-28 08:50:51 +00:00
Jeremy Ephron
7982c440d5 Debugger: Fix STL map size bug on Windows 
Fixed a bug in obtaining the size of STL map with MinGW 32/64. Retrieved
the size directly rather than unpacking the size from the data (which
is not present in on Windows). Tested for compatibility with LLVM/LLDB
on macOS.

Change-Id: I4d836d6288465e82d694de0405965586683c1355
Reviewed-by: hjk <hjk@qt.io>
 2020-04-28 08:25:04 +00:00
Tobias Hunger
9f92acf223 QmlPuppet: Fix build 
You can not use a variable in a lambda without capturing it.

Change-Id: Iada3e40c70c0584c82a5c95a40f64164ca533aed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-27 18:47:34 +00:00
Thomas Hartmann
4435a19979 QmlDesigner: Add Combo box for states 
Change-Id: I91494e297cc2c1aa4b192081b5cd31acbca87ce9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-27 11:21:14 +00:00
Henning Gruendl
104852e09d QmlDesigner: Update properties in property editor 
Add missing and cleanup existing properties in property editor.

Task-number: QDS-1502
Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-27 08:47:57 +00:00
Thomas Hartmann
9c17fd0dbe QmlDesigner: Extend icon font support 
* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update icon font and related constants

Change-Id: I31ac33917d2db002697ce63f50f5c181c5fdb103
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-04-27 08:47:31 +00:00
Eike Ziller
d79febdde9 Merge remote-tracking branch 'origin/4.12' 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
 2020-04-24 13:58:05 +02:00
Thomas Hartmann
d5ac552314 QmlDesigner: Fix ComboBox for raw strings 
Change-Id: Ie35bda95290042f2faaf938ee67b6ee02e8c55b1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-24 11:42:13 +00:00
Thomas Hartmann
0222630012 QmlDesigner: Add fontStyle support 
Task-number: QDS-1884
Change-Id: Ifb3ec8cf92668adb2e4e5f01e0e0b2403eb4cbac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-24 11:35:28 +00:00
Tim Jenssen
93ef6afff9 Merge remote-tracking branch 'origin/4.12' into qds-1.50 
Change-Id: If491fa41c07b9159d1755ef0580b4af6f6ca7d65
 2020-04-24 13:17:03 +02:00
Miikka Heikkinen
d1a7afa28f QmlDesigner: Add "closeup" option to focusObjectToCamera function 
The closeup option is used for itemlibrary thumbnail generation, where
the regular fit produces too small images on most imports.

Change-Id: I2901a2e20d100b155111f002b22489df945e9e01
Fixes: QDS-1899
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2020-04-24 10:29:43 +00:00
Thomas Hartmann
bbed542ec3 QmlDesigner: Expose typeFilter property 
Change-Id: Iaf0c6db67eb25b730bc31f87b52b0ec93ab15266
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-23 17:22:00 +00:00
Christian Kandeler
4c064c5f9b QmlDesigner: Fix warnings about unused lambda cpatures 
Change-Id: I73e7aeed02527efd657df44232c13bb2e136f5ee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-23 15:33:18 +00:00
Christian Kandeler
785b184fb6 QmlDesigner: Fix warnings about unused variables and functions 
Change-Id: Ib907db11dcdcef9cbbb91c8fd7af22ae420796b1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-23 13:49:04 +00:00
Miikka Heikkinen
652596dc16 QmlDesigner: Update UI when an asset is reimported 
Item library thumbnail and navigator icon are refreshed if asset is
reimported, and the puppet is restarted in case the asset is in use.

Change-Id: Ic5577eff3a24bcce87b504e9c059c29f6cb887a5
Fixes: QDS-1957
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-23 09:51:30 +00:00
Eike Ziller
8984272769 Merge remote-tracking branch 'origin/4.12' 
Change-Id: I296a61fe43aea134de9e7a6ee8042af3f45f5e99
 2020-04-23 11:09:15 +02:00
hjk
252a0431d1 Debugger: Fix dumper for std::unique_ptr with custom deleter 
Task-number: QTCREATORBUG-23885
Change-Id: Ifba6ef7233886d1c9341e7912d6924cd9afbc4eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-04-23 06:08:12 +00:00
Thiago Macieira
162ea716e6 Match use of int in operator>> 
Change-Id: I9709abb1c3734e10a7defffd1607e743f6d662e2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-22 21:21:06 +00:00
hjk
7d3c6f7c02 Android: Start lldb-server and attach 
Change-Id: Id7c45d9161d3389e9de419835c312d87916a34bc
Reviewed-by: David Schulz <david.schulz@qt.io>
 2020-04-22 08:12:48 +00:00
Thomas Hartmann
3caafb2b81 QmlDesigner: Inspect components for existing states 
For each created items we retrieve a list of the names
of all existing states.

Task-number: QDS-1978
Change-Id: I8e85e439fce3c6204cb8bcf69f6be847cc8dae5c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-04-21 10:57:26 +00:00
Henning Gruendl
07f8c1d0f3 QmlDesigner: Add padding for QtQuick positioner 
Add PaddingSection for Column, Row, Flow and Grid positioner in
PropertyEditor.

Task-number: QDS-1501
Change-Id: Icd7b6ed2ab371e3a821e725668ca0c9c63d1c1c9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2020-04-21 10:38:10 +00:00
Thomas Hartmann
74ffff63eb QmlDesigner: Allow setting state property 
This has to be blocked only for the root item.

Task-number: QDS-1979
Change-Id: Ia05255468623fe715e3f7172e2f058a70629b783
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-04-21 09:43:11 +00:00
Thomas Hartmann
970f075e33 QmlDesigner: Show proper error message for component 
If a component cannot be created we have to show a proper
error message.

Task-number: QDS-1980
Change-Id: I48a6ff0fd89c9666328c501abb00dc0997171d96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2020-04-21 09:41:12 +00:00
Jochen Seemann
9f981e7e23 AutoTest: Wizard: Add Support for Catch2 
Done-with: Christian Stenger <christian.stenger@qt.io>
Change-Id: Idc59cf962e54845746a645efb5e931502deae38e
Reviewed-by: David Schulz <david.schulz@qt.io>
 2020-04-20 08:43:45 +00:00
The Qt Project
7e3afa6657 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-04-17 09:45:59 +00:00
David Schulz
1eacbc98a8 Debugger: add dumper for Utils::Environment 
Change-Id: I2e80447b9b9690376a6d789c8b18d33cca22f4ab
Reviewed-by: hjk <hjk@qt.io>
 2020-04-17 07:20:45 +00:00
Eike Ziller
602d690bab Merge remote-tracking branch 'origin/4.12' 
Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
 2020-04-17 08:09:55 +02:00